Details

Reviewers

Commits

rB449db0ab1e34: Baking: new method to generate margin, based on adjacent faces

Summary

Add a new way of generating texture margins by copying pixels from adjacent polygons instead of repeating border pixels. Improves T92943.

Though there's still stuff that needs to happen (mainly UI) I'm open for comments.

Though I guess you want to wait till after v3.0 is released and the chaos has died down ;-)

Diff Detail

Repository

rB Blender

Branch

texture-margin (branched from master)

Build Status

Buildable 20002
Build 20002: arc lint + arc unit

Event Timeline

There are a very large number of changes, so older changes are hidden. Show Older Changes

Harbormaster completed remote builds in B19016: Diff 45370.Nov 28 2021, 6:23 PM

Steffen Hartmann (Harti) awarded a token.Nov 28 2021, 7:48 PM

Changing bake_filter to bake_margin might break scripts? I need to make sure that I can do that, or else rename it back.

clang-format
Move bake_margin_type to a more logical place and fix padding.
Handle generating a new margin for textures without alpha or mask.
Add an operator to call the margin generation for any bitmap.
Add the margin_copypixels operator to the image menu of the imaged editor.
Todo comment updated.
More explanatory comments, and a small clarification the the code.
Codestyle.
Merge branch 'master' into texture-margin
Merge branch 'master' into texture-margin
Add forgotten source file to git.
Put pointers to the MLoop and MPoly lists we actually need in the Map class, instead of a single pointer to Mesh.
Add support for copypixel margins to multiresolution baking.
Update todolist comment.
Merge branch 'master' into texture-margin
Rename generate_border -> generate_margin, to be more consistent.
Remove the debugfile output code.
Clang-format

Harbormaster completed remote builds in B19187: Diff 45617.Dec 3 2021, 9:34 PM

Start of implementation of new texture margin generation.
Reimplement (with lots of copypasting) the prototype inside blender
Fix a typo, lots of debugging help start with xtending the old way to help linear interpolation.
Only mirror on edges which are facing towards us.
Look up pixels in multiple polygons, if the margin is wider than the next polygon
Do all calculations in pixel space instead of uv space.
Use the IMB_filter_extend filter to fill in the missing parts.
Code cleanup. Get rid of static globals.
Move system includes to after blender includes.
Change all doubles to floats.
Use only unsigned ints where they really need to be unsigned.
Change the namespace to be in line with the codestyle guidelines.
Add some comments.
Replace the custom datatypes from the prototype with a single mapping array.
Make sure the final extend step doesn't mess up the interior of our texture.
Replace std::vector with blender::Vector .
Renamed functions to follow the blender stylle guide.
Renamed variables to be in line with the blender style guide.
Convert from uv to pixel coordinates in a consitent way.
Add some comments.
Layout.
Some more variable renaming and an extra comment added.
Todolist comment amended.
Document the entrypoint.
clang-format
Add a gui dropdown to select the new margin algoirithm.
Run clang-format on the changed files.
Fix comments spelling/formatting. Thanks Garek for checking them!
Update top comment todo list.
Clang format.
Remove unused variable to silence gcc warning.
clang-format
Move bake_margin_type to a more logical place and fix padding.
Handle generating a new margin for textures without alpha or mask.
Add an operator to call the margin generation for any bitmap.
Add the margin_copypixels operator to the image menu of the imaged editor.
Todo comment updated.
More explanatory comments, and a small clarification the the code.
Codestyle.
Add forgotten source file to git.
Put pointers to the MLoop and MPoly lists we actually need in the Map class, instead of a single pointer to Mesh.
Add support for copypixel margins to multiresolution baking.
Update todolist comment.
Rename generate_border -> generate_margin, to be more consistent.
Remove the debugfile output code.
Clang-format
Todo comment.
Remove todo comment, add licence comment.
When the operator is called from an image editor, use the image form the editor instead of the selected object's material.
clang-format

Harbormaster completed remote builds in B19324: Diff 45854.Dec 9 2021, 1:18 PM

Rebased onto master

Start of implementation of new texture margin generation.
Reimplement (with lots of copypasting) the prototype inside blender
Fix a typo, lots of debugging help start with xtending the old way to help linear interpolation.
Only mirror on edges which are facing towards us.
Look up pixels in multiple polygons, if the margin is wider than the next polygon
Do all calculations in pixel space instead of uv space.
Use the IMB_filter_extend filter to fill in the missing parts.
Code cleanup. Get rid of static globals.
Move system includes to after blender includes.
Change all doubles to floats.
Use only unsigned ints where they really need to be unsigned.
Change the namespace to be in line with the codestyle guidelines.
Add some comments.
Replace the custom datatypes from the prototype with a single mapping array.
Make sure the final extend step doesn't mess up the interior of our texture.
Replace std::vector with blender::Vector .
Renamed functions to follow the blender stylle guide.
Renamed variables to be in line with the blender style guide.
Convert from uv to pixel coordinates in a consitent way.
Add some comments.
Layout.
Some more variable renaming and an extra comment added.
Todolist comment amended.
Document the entrypoint.
clang-format
Add a gui dropdown to select the new margin algoirithm.
Run clang-format on the changed files.
Fix comments spelling/formatting. Thanks Garek for checking them!
Update top comment todo list.
Clang format.
Remove unused variable to silence gcc warning.
clang-format
Move bake_margin_type to a more logical place and fix padding.
Handle generating a new margin for textures without alpha or mask.
Add an operator to call the margin generation for any bitmap.
Add the margin_copypixels operator to the image menu of the imaged editor.
Todo comment updated.
More explanatory comments, and a small clarification the the code.
Codestyle.
Add forgotten source file to git.
Put pointers to the MLoop and MPoly lists we actually need in the Map class, instead of a single pointer to Mesh.
Add support for copypixel margins to multiresolution baking.
Update todolist comment.
Rename generate_border -> generate_margin, to be more consistent.
Remove the debugfile output code.
Clang-format
Todo comment.
Remove todo comment, add licence comment.
When the operator is called from an image editor, use the image form the editor instead of the selected object's material.
clang-format

Harbormaster completed remote builds in B19326: Diff 45857.Dec 9 2021, 1:28 PM

Add forgotten source file to git.
Start of implementation of new texture margin generation.
Reimplement (with lots of copypasting) the prototype inside blender
Fix a typo, lots of debugging help start with xtending the old way to help linear interpolation.
Only mirror on edges which are facing towards us.
Look up pixels in multiple polygons, if the margin is wider than the next polygon
Do all calculations in pixel space instead of uv space.
Use the IMB_filter_extend filter to fill in the missing parts.
Code cleanup. Get rid of static globals.
Move system includes to after blender includes.
Change all doubles to floats.
Use only unsigned ints where they really need to be unsigned.
Change the namespace to be in line with the codestyle guidelines.
Add some comments.
Replace the custom datatypes from the prototype with a single mapping array.
Make sure the final extend step doesn't mess up the interior of our texture.
Replace std::vector with blender::Vector .
Renamed functions to follow the blender stylle guide.
Renamed variables to be in line with the blender style guide.
Convert from uv to pixel coordinates in a consitent way.
Add some comments.
Layout.
Some more variable renaming and an extra comment added.
Todolist comment amended.
Document the entrypoint.
clang-format
Add a gui dropdown to select the new margin algoirithm.
Run clang-format on the changed files.
Fix comments spelling/formatting. Thanks Garek for checking them!
Update top comment todo list.
Clang format.
Remove unused variable to silence gcc warning.
clang-format
Move bake_margin_type to a more logical place and fix padding.
Handle generating a new margin for textures without alpha or mask.
Add an operator to call the margin generation for any bitmap.
Add the margin_copypixels operator to the image menu of the imaged editor.
Todo comment updated.
More explanatory comments, and a small clarification the the code.
Codestyle.
Put pointers to the MLoop and MPoly lists we actually need in the Map class, instead of a single pointer to Mesh.
Add support for copypixel margins to multiresolution baking.
Update todolist comment.
Rename generate_border -> generate_margin, to be more consistent.
Remove the debugfile output code.
Clang-format
Todo comment.
Remove todo comment, add licence comment.
When the operator is called from an image editor, use the image form the editor instead of the selected object's material.
clang-format

Harbormaster completed remote builds in B19327: Diff 45860.Dec 9 2021, 1:39 PM

Remove accidentally added include.

Harbormaster completed remote builds in B19328: Diff 45861.Dec 9 2021, 2:11 PM

Some quick comments from glancing over the code, no time to review the specifics of the algorithm right now, that may have to wait until January.

I don't think we should have the operator, even if it may be useful in some cases. It seems like a poor fit to have something so tightly coupled to baking logic but still separate from it.

source/blender/render/intern/texture_margin.cc
51	Use float2, float3, .. instead.
77	Remove this scanline pointer array mechanism, just pixel data directly.
134–138	Use less obscure names for macros.
337–338	Don't abbreviate already short terms like `edge_point` to `ep`.
548–550	This is only needed in the header file.

This revision now requires changes to proceed.Dec 9 2021, 8:07 PM

In D13303#357506, @Brecht Van Lommel (brecht) wrote:

Some quick comments from glancing over the code, no time to review the specifics of the algorithm right now, that may have to wait until January.

Ok, have a nice holiday ;-)

I don't think we should have the operator, even if it may be useful in some cases. It seems like a poor fit to have something so tightly coupled to baking logic but still separate from it.

it's not really tightly coupled to the baking logic though. Just to the UV map. IMHO it's quite handy to have this as an operator (a menu entry is probably overkill, but callable from python) to generate margins for existing models. Quite a few models you can download from various online sources have textures with bad (or none at all) margins. I myself already used it to improve a minetest model for my kids ;-)

But to keep it simple I've removed the operator parts in my local branch for now, and I'll look into the rest of the changes you requested.

Adding an operator can be done later if it turns out to be desirable.

Gavriel Lavi (Gavriel5578) awarded a token.Dec 11 2021, 12:25 AM

Did the requested changes

Martijn Versteegh (Baardaap) marked an inline comment as done.Dec 11 2021, 12:06 PM

Remove the operator code.
Replaced fvec with float2 and renamed some short variables.
(Hopefully) clearer macro names.
Removed scanline access pointers.
Remove unneeded 'extern "C"'

Harbormaster completed remote builds in B19363: Diff 45934.Dec 11 2021, 12:08 PM

Merge branch 'master' into texture-margin

Harbormaster completed remote builds in B19364: Diff 45935.Dec 11 2021, 12:12 PM

Renamed variable to match styleguide.

Harbormaster completed remote builds in B19365: Diff 45936.Dec 11 2021, 12:15 PM

Merge branch 'master' into texture-margin
Add the renaming of bake_filter to bake margin to dna_rename_defs.h

Harbormaster completed remote builds in B19900: Diff 46902.Jan 11 2022, 4:02 PM

Patch for the docs:

Index: manual/render/cycles/baking.rst
===================================================================
--- manual/render/cycles/baking.rst     (revision 8808)
+++ manual/render/cycles/baking.rst     (working copy)
@@ -234,6 +234,17 @@
          Baked result is extended this many pixels beyond the border of each UV "island",
          to soften seams in the texture.
 
+      .. _bpy.types.BakeSettings.margin_type:
+
+      Margin Type
+         How to generate the margin around the UV "islands".
+
+         :Extend:
+            Generate a margin by repeating the border pixels outwards.
+
+         :CopyPixels:
+            Generate a margin by copying pixels from the adjacent UV island.
+
       .. _bpy.types.BakeSettings.use_clear:
 
       Clear Image

This seems to work fine in my tests with a few meshes. Only relatively minor comments on the code, since this already has gone through many iterations.

Have you verified this works with selected to active baking?
Suggest to rename this from "CopyPixels" to "Adjacent Faces", I think that describes it more clearly. Also the terminology we generally use in Blender is "Adjacent Faces" rather than "Neighboring Polygons" (see Mesh edit mode menus).
Unless there are many failure cases, probably this should be the default?
UI could be tweaked to make a "Margin" subpanel with "Type" and "Size" settings. Generally we put "type" settings go on top.

source/blender/editors/object/object_bake_api.c
784–790	Can this code be moved into `generate_margin`, and also take into account the `uv_layer` name for the derivedmesh case there?
source/blender/render/intern/texture_margin.cc
55	I'd give this a more specific name like `TextureMarginMap`. It's in a namespace but still feels confusing to me to call this `Map` just like `BLI_map.`.
205	I guess it's easy enough to reuse this by making it `static const` in the class?
268	Rename `uv_to_xy`.
474–490	Would move this loop tri code a little higher to got with accessing other mesh data layers.
493	Remove unused code.

This revision now requires changes to proceed.Jan 13 2022, 6:38 PM

I don't even really know what the patch does, but I was curious so I read through the patch. Noticed some small things and figured I would comment

source/blender/editors/object/object_bake_api.c
2036	`What` -> `Which`
source/blender/render/RE_texture_margin.h
36–45	These shouldn't need to be declared with `extern`
source/blender/render/intern/texture_margin.cc
288	No need to use `blender::` here.
409–425	Think it would be nice to stick to the class layout from the style guide: https://wiki.blender.org/wiki/Style_Guide/C_Cpp#Class_Layout Also don't have a strong opinion on this, but I think the convention in Blender code is west const.
480–484	Just curious, why not use `BKE_mesh_runtime_looptri_ensure`?

Martijn Versteegh (Baardaap) added inline comments.Jan 13 2022, 9:18 PM

source/blender/render/intern/texture_margin.cc
205	woops, I meant to do that, but I forgot ! ;-)
409–425	I can do it with west const. I like east const better because it's more consistent (the const always protects the thing left of it) . To me MPoly const * const variable; is more consistent than const MPoly * const variable; But I don't have a strong opinion either way, and if the rest of blender uses west const than I'll change it. I'll have a look at that Class Layout guide, I must admit I hadn't studied that one yet.
480–484	Because I didn't know that existed ;-) I copy-pasted this from somewhere else.

Vyacheslav (hitrpr) awarded a token.Jan 14 2022, 12:18 AM

Brecht Van Lommel (brecht) added inline comments.Jan 14 2022, 12:37 PM

source/blender/render/intern/texture_margin.cc
480–484	Using `ensure` will permanently store the looptris and increases memory usage that way. In this case I think the time taken by baking is significant anyway, so would rather not increases memory usage to potentially save a bit of time somewhere.

Moved lookup of MLoopUV data to generate_margin( )
Fixed description string. (What algorithm -> Which algorithm)
Renamed uvtoxy to uv_to_xy(). Removed blender:: namespace spcifier from Vector. Made the direcions a static onct member of the class.
Moved looptri generation together with other data layer accesses.
Removed extraneous 'extern's and unused code.

Harbormaster completed remote builds in B20002: Diff 47080.Jan 14 2022, 4:24 PM

Martijn Versteegh (Baardaap) added inline comments.Jan 14 2022, 4:24 PM

source/blender/editors/object/object_bake_api.c
784–790	I moved it there. That is slightly more logical. However I still need to pass the char const *uv_layer in, and the MultiRes baking doesn't have that, so it doesn't really simplify the code as much as I'd like. Still more clear this way I think.
source/blender/render/intern/texture_margin.cc
288	hm. It feels somewhat scary to me to use a generic name like Vector without explicit namespace , but ok.
496–505	@Brecht Van Lommel (brecht) I copied this code from where the baking pixels are generated. It feels slightly dodgy to duplicate this code here, especially with the added workaround. Should I create a utility function for this?

Martijn Versteegh (Baardaap) marked an inline comment as done.Jan 14 2022, 5:00 PM

Martijn Versteegh (Baardaap) added inline comments.

source/blender/render/intern/texture_margin.cc
409–425	Oh, now I marked this as done, but I didn't yet change the const positions.... Tomorrow maybe. I feel a slight mental resistance :-) ...

Lopo Isaac (lopoIsaac) awarded a token.Jan 14 2022, 5:21 PM

Have you verified this works with selected to active baking?

I did a few quick tests some time ago and it seemed to work ok. I can't really think of a reason why it wouldn't. But more thorough testing might be good.

Suggest to rename this from "CopyPixels" to "Adjacent Faces", I think that describes it more clearly. Also the terminology we generally use in Blender is "Adjacent Faces" rather than "Neighboring Polygons" (see Mesh edit mode menus).

Adjacent Faces is better indeed. The CopyPixels was more of a placeholder because I couldn't think of a better name.

Unless there are many failure cases, probably this should be the default?

I was a bit scared to do that. But I *think* it would be a good default. I need to run some more tests with meshes with very small polygons though, I'm not really sure how ell it works in that case (polygons narrower than ~2-3 pixels)

UI could be tweaked to make a "Margin" subpanel with "Type" and "Size" settings. Generally we put "type" settings go on top.

I'll have a look at it. The gui code still slightly scares me ;-)

Follow the blender style guide for class layout.
Rename CopyPixels to AdjacentFaces
Put the margin type above the margin size in the UI.

Harbormaster completed remote builds in B20008: Diff 47090.Jan 14 2022, 11:24 PM

Put the margin setting in their own panel.
Set the default margin generation to ADJACENTFACES.

Harbormaster completed remote builds in B20014: Diff 47097.Jan 15 2022, 9:41 PM

I put the margin settings into their own sub-panel. Though I'm not really sure I like the way that works out. To me it feels more like adding clutter than removing clutter.

I also set the default to AdjacentFaces, but I need to look over all places where the default is set carefully, because I don't really trust I did it right. Just setting the default to adjacentfaces was not enough, it only started working when I also put AdjacentFaces in the top spot in the gui (and swapped ther integer values in the enum, though I'm not sure if that was actually needed).

Merge branch 'master' into texture-margin

Harbormaster completed remote builds in B20021: Diff 47108.Jan 16 2022, 7:51 PM

Brecht Van Lommel (brecht) mentioned this in rBM8817: Render: update for new baking margin type.Jan 17 2022, 7:39 PM

Brecht Van Lommel (brecht) mentioned this in rBL62791: Tests: update for new bake margin type.

Thanks for all the work. I'll commit this with some naming tweaks and a memory leak fix. Will also commit an update to the manual.

This revision is now accepted and ready to land.Jan 17 2022, 7:41 PM

Closed by commit rB449db0ab1e34: Baking: new method to generate margin, based on adjacent faces (authored by Martijn Versteegh (Baardaap), committed by Brecht Van Lommel (brecht)). · Explain WhyJan 17 2022, 7:41 PM

This revision was automatically updated to reflect the committed changes.

Brecht Van Lommel (brecht) added a commit: rB449db0ab1e34: Baking: new method to generate margin, based on adjacent faces.

Paul Larson (GeorgiaPacific) added a subscriber: Paul Larson (GeorgiaPacific).Jan 17 2022, 9:26 PM

In D13303#367731, @Brecht Van Lommel (brecht) wrote:

Thanks for all the work. I'll commit this with some naming tweaks and a memory leak fix. Will also commit an update to the manual.

Ah. I tried to push a new diff because I found a memory leak. But it bounced because the diff was already closed ;-)
hopefully it was the same leak. I'll check.

(edit: yes, it was the same one ;-) )

Omar Emara (OmarSquircleArt) mentioned this in T92904: Blender cannot bake from box blended mapping without seams.Mar 23 2022, 9:01 AM

Commit	Tree	Parents	Author	Summary	Date
13903ed00388	654c57a026a4	7c7ddf770ebb	martijn	Removed extraneous 'extern's and unused code.	Jan 14 2022, 4:22 PM
7c7ddf770ebb	42d30cf53c56	a056988c97ed	martijn	Moved looptri generation together with other data layer accesses.	Jan 14 2022, 4:17 PM
a056988c97ed	1228362f82b7	7faf4143cd64	martijn	Renamed uvtoxy to uv_to_xy(). Removed blender:: namespace spcifier from Vector. (Show More…)	Jan 14 2022, 4:14 PM
7faf4143cd64	53a0f0fa2c3a	ef99297af862	martijn	Fixed description string. (What algorithm -> Which algorithm)	Jan 14 2022, 4:05 PM
ef99297af862	491c5f736d14	fe5b3281a152	martijn	Moved lookup of MLoopUV data to generate_margin( )	Jan 14 2022, 4:03 PM
fe5b3281a152	896c2bb3d670	91d434bd859e	martijn	Add the renaming of bake_filter to bake margin to dna_rename_defs.h	Jan 11 2022, 4:00 PM
91d434bd859e	b69c1abdfa1e	1b06dfa3f6eb 0c94e5d16602	martijn	Merge branch 'master' into texture-margin	Jan 11 2022, 3:39 PM
1b06dfa3f6eb	1f6c9792470e	73ea12ed9071	martijn	Renamed variable to match styleguide.	Dec 11 2021, 12:15 PM
73ea12ed9071	eb521aed4002	308359b85907 7b88a4a3ba7e	martijn	Merge branch 'master' into texture-margin	Dec 11 2021, 12:11 PM
308359b85907	1843c90bbd48	ad81b5f9d25a	martijn	Remove unneeded 'extern "C"'	Dec 11 2021, 12:05 PM
ad81b5f9d25a	3a6fa7cb3bd5	8961ddaed099	martijn	Removed scanline access pointers.	Dec 11 2021, 11:10 AM
8961ddaed099	953cf129d1db	441c1e6a7c93	martijn	(Hopefully) clearer macro names.	Dec 11 2021, 11:03 AM
441c1e6a7c93	f66e7add005a	1865024a66d8	martijn	Replaced fvec with float2 and renamed some short variables.	Dec 11 2021, 10:59 AM
1865024a66d8	788c77948315	28c9fd9883c0	Martijn Versteegh	Remove the operator code.	Dec 9 2021, 9:35 PM
28c9fd9883c0	fdfc955acb13	85deed2ad21b	Martijn Versteegh	Remove accidentally added include.	Dec 9 2021, 1:54 PM
85deed2ad21b	a37e6d147947	3e85baa818e1	Martijn Versteegh	clang-format	Dec 8 2021, 11:39 PM
3e85baa818e1	890ae808a675	cdca9439cac3	Martijn Versteegh	When the operator is called from an image editor, use the image form the editor… (Show More…)	Dec 8 2021, 11:38 PM
cdca9439cac3	207b0e7e592b	88368673e86c	Martijn Versteegh	Remove todo comment, add licence comment.	Dec 8 2021, 3:32 PM
88368673e86c	e591e7cecb93	1173ef546f51	Martijn Versteegh	Todo comment.	Dec 8 2021, 12:48 PM
1173ef546f51	e521eeb6cdf6	866368db5597	martijn	Clang-format	Dec 3 2021, 9:33 PM
866368db5597	bf10c51b1d17	f6df30892edf	martijn	Remove the debugfile output code.	Dec 3 2021, 9:26 PM
f6df30892edf	fe4803ea08bd	ea55fc4c1328	martijn	Rename generate_border -> generate_margin, to be more consistent.	Dec 3 2021, 9:09 PM
ea55fc4c1328	6cbb60b884f9	918b0aca2bb3	martijn	Update todolist comment.	Dec 3 2021, 8:59 PM
918b0aca2bb3	02797acfbcb1	2880a4eb1976	martijn	Add support for copypixel margins to multiresolution baking.	Dec 3 2021, 2:25 PM
2880a4eb1976	6700149ddf16	865b34348796	martijn	Put pointers to the MLoop and MPoly lists we actually need in the Map class… (Show More…)	Dec 2 2021, 11:41 PM
865b34348796	4bfb7fab9a94	8470cd024da6	Martijn Versteegh	Codestyle.	Dec 2 2021, 11:35 AM
8470cd024da6	8796f9390e86	7e3d6e43d347	Martijn Versteegh	More explanatory comments, and a small clarification the the code.	Dec 2 2021, 11:35 AM
7e3d6e43d347	edc892558cfe	da9164094617	Martijn Versteegh	Todo comment updated.	Dec 2 2021, 11:34 AM
da9164094617	3544254593ba	cfd92b8df874	Martijn Versteegh	Add the margin_copypixels operator to the image menu of the imaged editor.	Dec 1 2021, 6:11 PM
cfd92b8df874	7fd3d89cc5f2	223f7d532689	Martijn Versteegh	Add an operator to call the margin generation for any bitmap. (Show More…)	Dec 1 2021, 6:09 PM
223f7d532689	280bd92ec60d	cdd3028a3274	Martijn Versteegh	Handle generating a new margin for textures without alpha or mask. (Show More…)	Dec 1 2021, 1:29 PM
cdd3028a3274	f0f4eb7505e8	abbaabdd7fb7	martijn	Move bake_margin_type to a more logical place and fix padding. (Show More…)	Nov 30 2021, 11:09 PM
abbaabdd7fb7	5eaf514816f1	c3e8b7089ae1	martijn	clang-format	Nov 29 2021, 9:10 AM
c3e8b7089ae1	e67fcf47d420	d38e62127b9c	Martijn Versteegh	Remove unused variable to silence gcc warning.	Nov 28 2021, 6:22 PM
d38e62127b9c	cb9875882367	ef67ddbf5699	martijn	Clang format.	Nov 28 2021, 3:41 PM
ef67ddbf5699	f672c32b2c79	0d7b4fcfd6c0	martijn	Update top comment todo list.	Nov 28 2021, 3:38 PM
0d7b4fcfd6c0	5ca986554a47	4c9fff5ef900	Martijn Versteegh	Fix comments spelling/formatting. Thanks Garek for checking them!	Nov 28 2021, 2:10 PM
4c9fff5ef900	e26883a5c2fc	e764127abaec	martijn	Run clang-format on the changed files.	Nov 28 2021, 12:08 AM
e764127abaec	2ec4e6cb4947	d91ece102ef7	martijn	Add a gui dropdown to select the new margin algoirithm. (Show More…)	Nov 28 2021, 12:00 AM
d91ece102ef7	0308675e5d65	d79c3b4b4b74	martijn	clang-format	Nov 26 2021, 10:35 PM
d79c3b4b4b74	68d1bb41ed17	c78b4a6ad207	Martijn Versteegh	Document the entrypoint.	Nov 26 2021, 10:20 PM
c78b4a6ad207	dd15877a2e38	a730e4950bc8	Martijn Versteegh	Todolist comment amended.	Nov 26 2021, 10:14 PM
a730e4950bc8	6750120d9daf	4b8f2697f104	Martijn Versteegh	Some more variable renaming and an extra comment added.	Nov 26 2021, 10:12 PM
4b8f2697f104	2b6cf58584ed	f670bcf7b76e	Martijn Versteegh	Layout.	Nov 26 2021, 10:11 PM
f670bcf7b76e	c54c0e5ba138	d527ab11a2f1	Martijn Versteegh	Add some comments.	Nov 26 2021, 10:10 PM
d527ab11a2f1	990403245bf6	438eed3f9157	Martijn Versteegh	Convert from uv to pixel coordinates in a consitent way.	Nov 26 2021, 9:31 PM
438eed3f9157	6cd372f41010	0939633f7904	Martijn Versteegh	Renamed variables to be in line with the blender style guide.	Nov 26 2021, 9:26 PM
0939633f7904	ffee98a99198	11480d1ab1f4	Martijn Versteegh	Renamed functions to follow the blender stylle guide.	Nov 26 2021, 9:15 PM
11480d1ab1f4	0b80be3ad40e	d3cfcc54dabd	Martijn Versteegh	Replace std::vector with blender::Vector .	Nov 26 2021, 9:07 PM
d3cfcc54dabd	f16efd6a2de0	dc2c8c46af2e	martijn	Make sure the final extend step doesn't mess up the interior of our texture.	Nov 26 2021, 4:36 PM
dc2c8c46af2e	c7ad71bc9e7c	df7322f6061c	martijn	Replace the custom datatypes from the prototype with a single mapping array. (Show More…)	Nov 26 2021, 4:32 PM
df7322f6061c	fdce1ea1b13c	17e1d8080ce0	Martijn Versteegh	Add some comments.	Nov 25 2021, 8:57 PM
17e1d8080ce0	29a10435ef5b	5b2709505abb	Martijn Versteegh	Change the namespace to be in line with the codestyle guidelines.	Nov 25 2021, 8:56 PM
5b2709505abb	66dddcf48395	73cedd0b3987	Martijn Versteegh	Use only unsigned ints where they really need to be unsigned.	Nov 25 2021, 7:40 PM
73cedd0b3987	9a1d89cd8e17	877d3c0d2c01	Martijn Versteegh	Change all doubles to floats. (Show More…)	Nov 25 2021, 7:19 PM
877d3c0d2c01	fdf3d53a3142	f32b64861237	Martijn Versteegh	Move system includes to after blender includes.	Nov 25 2021, 7:05 PM
f32b64861237	5e9d733a04a0	ef34658fb883	Martijn Versteegh	Code cleanup. Get rid of static globals.	Nov 25 2021, 2:38 PM
ef34658fb883	d7028e9ae82a	b68bfecf219e	martijn	Use the IMB_filter_extend filter to fill in the missing parts. (Show More…)	Nov 24 2021, 11:06 PM
b68bfecf219e	3fc1b27466d7	397323057617	martijn	Do all calculations in pixel space instead of uv space.	Nov 24 2021, 9:33 AM
397323057617	86b26a8ce868	6e8f54a461aa	martijn	Look up pixels in multiple polygons, if the margin is wider than the next… (Show More…)	Nov 23 2021, 7:50 PM
6e8f54a461aa	bf33c051f714	1ea334c4f7eb	martijn	Only mirror on edges which are facing towards us. (Show More…)	Nov 23 2021, 10:14 AM
1ea334c4f7eb	a3db6dcadc30	6098550f40a9	martijn	Fix a typo, lots of debugging help start with xtending the old way to help… (Show More…)	Nov 22 2021, 11:24 PM
6098550f40a9	5bae67d48c61	c39aac3ae171	martijn	Reimplement (with lots of copypasting) the prototype inside blender	Nov 21 2021, 11:00 PM
c39aac3ae171	e12dd722cacc	be674776a4cd	martijn	Start of implementation of new texture margin generation. (Show More…)	Nov 19 2021, 3:42 PM
be674776a4cd	6d333e8ae55a	d812e46f40bc	Martijn Versteegh	Add forgotten source file to git.	Dec 2 2021, 8:50 PM

Start of implementation of new texture margin generation.
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 47080

intern/cycles/blender/addon/ui.py

source/blender/blenloader/intern/versioning_legacy.c

source/blender/editors/object/object_bake.c

source/blender/editors/object/object_bake_api.c

source/blender/makesdna/DNA_scene_defaults.h

source/blender/makesdna/DNA_scene_types.h

source/blender/makesdna/intern/dna_rename_defs.h

source/blender/makesrna/RNA_enum_items.h

source/blender/makesrna/intern/rna_scene.c

source/blender/render/CMakeLists.txt

source/blender/render/RE_bake.h

source/blender/render/RE_multires_bake.h

source/blender/render/RE_texture_margin.h

source/blender/render/intern/bake.c

source/blender/render/intern/multires_bake.c

source/blender/render/intern/texture_margin.cc

Start of implementation of new texture margin generation.ClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 47080

intern/cycles/blender/addon/ui.py

source/blender/blenloader/intern/versioning_legacy.c

source/blender/editors/object/object_bake.c

source/blender/editors/object/object_bake_api.c

source/blender/makesdna/DNA_scene_defaults.h

source/blender/makesdna/DNA_scene_types.h

source/blender/makesdna/intern/dna_rename_defs.h

source/blender/makesrna/RNA_enum_items.h

source/blender/makesrna/intern/rna_scene.c

source/blender/render/CMakeLists.txt

source/blender/render/RE_bake.h

source/blender/render/RE_multires_bake.h

source/blender/render/RE_texture_margin.h

source/blender/render/intern/bake.c

source/blender/render/intern/multires_bake.c

source/blender/render/intern/texture_margin.cc

Start of implementation of new texture margin generation.
ClosedPublic
Actions

Revision Contents
Changeset List