Start of implementation of new texture margin generation.
ClosedPublic
Actions

Authored by Martijn Versteegh (Baardaap) on Nov 21 2021, 11:10 PM.

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 19363
Build 19363: 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
2056	`What` -> `Which`
source/blender/render/RE_texture_margin.h
35–44	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

Revision Contents
Changeset List

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	45056	fb470c2		Nov 21 2021, 11:10 PM	★	★
Diff 2	45109	456d5e1	- Start of implementation of new texture margin generation.	Nov 22 2021, 11:25 PM	★	★
Diff 3	45257	c26011e	Still not in a reviewable state, but it shoudl be functionally correct now.	Nov 24 2021, 11:12 PM	★	★
Diff 4	45333	c26011e	New texture margin generation.	Nov 26 2021, 11:10 PM	★	★
Diff 5	45334	2531358	New texture margin generation.	Nov 26 2021, 11:13 PM	★	★
Diff 6	45363	2531358	- Add a gui dropdown to select the new margin algoirithm.	Nov 28 2021, 3:41 PM	★	★
Diff 7	45370	2531358	- Remove unused variable to silence gcc warning.	Nov 28 2021, 6:23 PM	★	★
Diff 8	45617	ca0dbf8	- clang-format	Dec 3 2021, 9:34 PM	★	★
Diff 9	45854	e6a732d	- Start of implementation of new texture margin generation.	Dec 9 2021, 1:18 PM	★	★
Diff 10	45857	aec56e5	Rebased onto master	Dec 9 2021, 1:28 PM	★	★
Diff 11	45860	d812e46	- Add forgotten source file to git.	Dec 9 2021, 1:38 PM	★	★
Diff 12	45861	be67477	- Remove accidentally added include.	Dec 9 2021, 2:11 PM	★	★
Diff 13	45934	1de3636	- Remove the operator code.	Dec 11 2021, 12:08 PM	★	★
Diff 14	45935	7b88a4a	- Merge branch 'master' into texture-margin	Dec 11 2021, 12:12 PM	★	★
Diff 15	45936	7b88a4a	- Renamed variable to match styleguide.	Dec 11 2021, 12:15 PM	★	★
Diff 16	46902	0c94e5d	- Merge branch 'master' into texture-margin	Jan 11 2022, 4:02 PM	★	★
Diff 17	47080	0c94e5d	- Moved lookup of MLoopUV data to generate_margin( )	Jan 14 2022, 4:23 PM	★	★
Diff 18	47090	0c94e5d	- Follow the blender style guide for class layout.	Jan 14 2022, 11:24 PM	★	★
Diff 19	47097	0c94e5d	- Put the margin setting in their own panel.	Jan 15 2022, 9:41 PM	★	★
Diff 20	47108	d914cfc	- Merge branch 'master' into texture-margin	Jan 16 2022, 7:51 PM	★	★
Diff 21	47165	8af2271	rB449db0ab1e34976f3936310b846ab38cc2d6467d	Jan 17 2022, 7:36 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
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
d812e46f40bc	9e6fdd354e17	74e57efb2d1d	Campbell Barton	Cleanup: move public doc-strings into headers for 'io/usd' (Show More…)	Dec 9 2021, 12:46 PM
74e57efb2d1d	0bca671cad7f	69f55b1b6216	Campbell Barton	Cleanup: move public doc-strings into headers for 'io/alembic' (Show More…)	Dec 9 2021, 12:32 PM
69f55b1b6216	6efed9d8d23f	9183f9f8602a	Julian Eisel	Cleanup: Various cleanups to the tree-view API (Show More…)	Dec 9 2021, 12:07 PM
9183f9f8602a	f8101a44d217	50f378e5c8cc	Julian Eisel	Cleanup/Documentation: Add/move comments for asset files (Show More…)	Dec 9 2021, 11:56 AM
50f378e5c8cc	56a01d644fe3	973dac9b5f78	Campbell Barton	Cleanup: move public doc-strings into headers for 'io/collada' (Show More…)	Dec 9 2021, 12:25 PM
973dac9b5f78	ffc8577d642c	7f4878ac7f56	Campbell Barton	Cleanup: use doxy section for itasc_plugin (Show More…)	Dec 9 2021, 11:18 AM
7f4878ac7f56	2fb612ec9cfa	b8bad3549dce	Campbell Barton	Cleanup: move public doc-strings into headers for 'functions' (Show More…)	Dec 9 2021, 11:16 AM
b8bad3549dce	6a0ac31a732d	65de17ece462	Azeem Bande-Ali	Fix T93519: handle prefix names in autocompletes (Show More…)	Dec 9 2021, 11:09 AM
65de17ece462	ed248b9cf3fd	bc010036739e	Campbell Barton	Cleanup: move public doc-strings into headers for 'freestyle' (Show More…)	Dec 9 2021, 11:09 AM
bc010036739e	ab1e75b79196	cd4a7be5b2ec	Campbell Barton	Cleanup: move public doc-strings into headers for 'nodes/geometry' (Show More…)	Dec 9 2021, 10:58 AM
cd4a7be5b2ec	8887348ff661	3647a1e62199	Campbell Barton	Cleanup: move public doc-strings into headers for 'io/gpencil' (Show More…)	Dec 9 2021, 10:31 AM
3647a1e62199	28451e99b012	8ef8f3a60a0a	Campbell Barton	Cleanup: move public doc-strings into headers for 'geometry' (Show More…)	Dec 9 2021, 10:23 AM
8ef8f3a60a0a	9a7f156ebfe8	15a428eab0e0	Campbell Barton	Cleanup: spelling in comments	Dec 9 2021, 10:21 AM
15a428eab0e0	7d4581c41890	8aed5dbcf8e0	Campbell Barton	Cleanup: move public doc-strings into headers for 'gpencil_modifiers' (Show More…)	Dec 9 2021, 10:11 AM
8aed5dbcf8e0	9b5dfea6aff4	7c76bdca1b71	Campbell Barton	Cleanup: move public doc-strings into headers for 'compositor' (Show More…)	Dec 9 2021, 10:01 AM
7c76bdca1b71	003fab9c0a71	9f546d690899	Campbell Barton	Cleanup: move public doc-strings into headers for 'gpu' (Show More…)	Dec 9 2021, 10:01 AM
9f546d690899	77aa93445966	9e365069afe1	Campbell Barton	Cleanup: move public doc-strings into headers for 'imbuf' (Show More…)	Dec 9 2021, 10:01 AM
9e365069afe1	78373044d029	d8b42751625c	Campbell Barton	Cleanup: move public doc-strings into headers for 'blenlib' (Show More…)	Dec 9 2021, 10:01 AM
d8b42751625c	36c4be1ae41c	894269ad1246	Alaska	Cycles-X: Add hysteresis to resolution divider algorithm (Show More…)	Dec 9 2021, 9:12 AM
894269ad1246	028d76a36dae	30cebf5747a2	Peter Kim	Fix incorrect copying of XR action map items (Show More…)	Dec 9 2021, 8:29 AM
30cebf5747a2	6aa0baa5d758	cf6be711e2a0	Aaron Carlisle	Cleanup: Remove empty node button layout function (Show More…)	Dec 9 2021, 4:02 AM
cf6be711e2a0	d8988604ab3b	3753a0b72bd8	Germano Cavalcante	Fix T93869: snap cursor may fail in orthographic view (Show More…)	Dec 9 2021, 3:47 AM
3753a0b72bd8	01eebb15ed69	be2213472f82	Erik	Fix T93523: Memory leak in Menu Search (Show More…)	Dec 9 2021, 1:48 AM
be2213472f82	acc53f04c855	f32b63ec583c	Lukas Stockner	Fix T93858: Zstd-compressed .blend files from external tools aren't recognized (Show More…)	Dec 8 2021, 11:35 PM
f32b63ec583c	d9daeecf905b	6ebc581b52e9	Germano Cavalcante	Fix T93642: value used as transform offset is ignored in some modes (Show More…)	Dec 8 2021, 6:20 PM
6ebc581b52e9	7ab43cfbb3cd	069d63561a4c	Germano Cavalcante	Cleanup: Avoid lookup the same property string multiple times (Show More…)	Dec 8 2021, 5:56 PM
069d63561a4c	f357c4a81a7d	72b39d3f9200	Johnny Matthews	Geometry Nodes: Mesh Island Node (Show More…)	Dec 8 2021, 5:14 PM
72b39d3f9200	8370efe3e066	e23b54a59f04	Philipp Oeser	Fix T93728: Greasepencil separate will loose all vertex groups (Show More…)	Dec 8 2021, 10:31 AM
e23b54a59f04	ae2910fbd158	5e9dba822d8d	Michael Jones	Cycles: Fix OS version warnings (Show More…)	Dec 8 2021, 4:07 PM
5e9dba822d8d	edb1e72037c3	98bb8e6955b1	Campbell Barton	Cleanup: Avoid error prone pointer storage in SnapObjectParams (Show More…)	Dec 8 2021, 3:59 PM
98bb8e6955b1	c338b90ab0c5	5b067594738e	Brecht Van Lommel	Fix T91680: viewport selection broken in macOS x86 build with Xcode 13 (Show More…)	Dec 8 2021, 3:40 PM
5b067594738e	d05a70a7d44d	61776befc3f8	Hans Goudey	Cleanup: Use float2 for node view functions (Show More…)	Dec 8 2021, 3:44 PM
61776befc3f8	0214b7c51463	8f1997975dc6	Campbell Barton	Cleanup: move public doc-strings into headers for 'editors' (Show More…)	Dec 8 2021, 2:55 PM
8f1997975dc6	91f3b0e1248e	32b1a13fa1e4	Jeroen Bakker	ImBuf: Performance IMB_transform. (Show More…)	Dec 8 2021, 1:00 PM
32b1a13fa1e4	0c8715816dc6	e89d42ddffef	Campbell Barton	Cleanup: move public doc-strings into headers for 'sequencer' (Show More…)	Dec 8 2021, 11:02 AM
e89d42ddffef	9997122e126d	a46ff1dd38a2	Campbell Barton	Cleanup: move public doc-strings into headers for 'draw' (Show More…)	Dec 8 2021, 10:29 AM
a46ff1dd38a2	9760fe898727	2c0ccb0159d1	Campbell Barton	Cleanup: move public doc-strings into headers for 'shader_fx' (Show More…)	Dec 8 2021, 8:03 AM
2c0ccb0159d1	8ca75ec7c17f	07726ef1b609	Campbell Barton	Cleanup: move public doc-strings into headers for 'simulation' (Show More…)	Dec 8 2021, 8:02 AM
07726ef1b609	e55e9549125a	ca0c9757f228	Campbell Barton	Cleanup: move public doc-strings into headers for 'blentranslation' (Show More…)	Dec 8 2021, 7:54 AM
ca0c9757f228	faee776dd46d	a7b64a714d55	Jeroen Bakker	Cleanup: moved IMB_transform to transform.cc. (Show More…)	Dec 8 2021, 9:54 AM
a7b64a714d55	0fd91e8f0e9d	4f48b2992bdf	Jeroen Bakker	Cleanup: Silence clang-tidy warnings.	Dec 8 2021, 9:52 AM
4f48b2992bdf	74992624a706	93ba5e237546	Campbell Barton	Cleanup: move public doc-strings into headers for 'blenloader' (Show More…)	Dec 8 2021, 7:37 AM
93ba5e237546	5c20356d9448	7e9271743964	Campbell Barton	Cleanup: move public doc-strings into headers for 'render' (Show More…)	Dec 8 2021, 7:12 AM
7e9271743964	8dddc753af3f	db795a4727b3	Campbell Barton	Cleanup: move public doc-strings into headers for 'windowmanager' (Show More…)	Dec 8 2021, 7:12 AM
db795a4727b3	1c78acadb1fa	da67a19ed9b5	Campbell Barton	Cleanup: move public doc-strings into headers for 'makesrna' (Show More…)	Dec 8 2021, 7:12 AM
da67a19ed9b5	561f4c4c7083	254511911287	Campbell Barton	Cleanup: move public doc-strings into headers for 'makesdna' (Show More…)	Dec 8 2021, 7:12 AM
254511911287	58443070ce34	d6c3ea9e7aaa	Campbell Barton	Cleanup: move public doc-strings into headers for 'blendthumb' (Show More…)	Dec 8 2021, 7:12 AM
d6c3ea9e7aaa	589b91c79c93	00f3957b8edd	Campbell Barton	Cleanup: move public doc-strings into headers for 'blenfont' (Show More…)	Dec 8 2021, 7:12 AM
00f3957b8edd	1ef2ae448662	c1279768a77d	Campbell Barton	Cleanup: move public doc-strings into headers for 'modifiers' (Show More…)	Dec 8 2021, 7:12 AM
c1279768a77d	1def9c880322	cbcd74de2267	Aaron Carlisle	Cleanup: Clang-Tidy modernize-redundant-void-arg	Dec 8 2021, 6:31 AM
cbcd74de2267	aed97e444c5b	b71e29b3dacb	Aaron Carlisle	Cleanup: Missing braces in array declaration	Dec 8 2021, 6:30 AM
b71e29b3dacb	029a421e3084	47b36ddccee0	Aaron Carlisle	Cleanup: clang-format	Dec 8 2021, 5:12 AM
47b36ddccee0	6790bdb73439	2964c4e1d088	Aaron Carlisle	Cleanup: Nodes: clang-tidy modernize-redundant-void-arg	Dec 8 2021, 5:09 AM
2964c4e1d088	88232b2b0a10	333dc7b5c4ee	Campbell Barton	Cleanup: spelling in comments	Dec 8 2021, 1:30 AM
333dc7b5c4ee	e2341a03b931	0d8c479225d7	Aaron Carlisle	Nodes: Add Shader Socket to new decleration API (Show More…)	Dec 8 2021, 3:05 AM
0d8c479225d7	c5965a90735d	1552c92fb1e7	Aaron Carlisle	Shader Nodes: Use camel case for file names (Show More…)	Dec 7 2021, 10:24 PM
1552c92fb1e7	29dea2302cdf	5568455d63a2	Michael Jones	Cycles: Fix Metal BVH crash caused by missing `WITH_METAL` define (Show More…)	Dec 7 2021, 10:05 PM
5568455d63a2	97d51373e641	204ae33d7555	Hans Goudey	Cleanup: Extend a few comments in BKE_spline.hh	Dec 7 2021, 9:17 PM
204ae33d7555	b83e69f4b4de	b81508841639	Brecht Van Lommel	Revert "Fix T93350: Cycles renders shows black during rendering huge… (Show More…)	Dec 7 2021, 8:49 PM
b81508841639	45523e60f53a	24e016546302	Brecht Van Lommel	Tests: add Cycles perspective/ortho/panoramic camera regression tests (Show More…)	Dec 7 2021, 8:07 PM
24e016546302	ef2caa5d7767	205254150ae2	Håkan Ardö	Cycles: add Fisheye Lens Polynomial camera model (Show More…)	Dec 7 2021, 6:54 PM
205254150ae2	016b546bb6fa	763cd2e0beea	Brecht Van Lommel	Build: don't look for CUDA toolkit if not using Cycles CUDA device	Dec 7 2021, 7:51 PM
763cd2e0beea	381dacc54386	5bd41b2e255c	Brecht Van Lommel	Cleanup: fix compiler warning	Dec 7 2021, 7:19 PM
5bd41b2e255c	3cda7100d807	63bd356faf9c	Aaron Carlisle	Shader Nodes: Create a new bf_nodes_shader library (Show More…)	Dec 7 2021, 7:19 PM
63bd356faf9c	560501c8081a	b9641cfc37bc	Aaron Carlisle	Cleanup: Missing include (Show More…)	Dec 7 2021, 6:40 PM
b9641cfc37bc	8558d4a5accb	7fbb767259bf	Aaron Carlisle	Cleanup: clang-tidy: modernize-redundant-void-arg (Show More…)	Dec 7 2021, 6:36 PM
7fbb767259bf	bba512adc0c4	5e37f70307bd	Hans Goudey	Docs: Add more comments to geometry set header (Show More…)	Dec 7 2021, 7:04 PM
5e37f70307bd	dbf2d3085b28	a92805bf24f5	Sergey Sharybin	Fix T93350: Cycles renders shows black during rendering huge resolutions (Show More…)	Dec 7 2021, 6:50 PM
a92805bf24f5	6770f8f15eae	484714992c87	Mikhail Matrosov	Fix T93418: Cycles shadow terminator Geometry Offset artifacts with translucency (Show More…)	Dec 7 2021, 6:48 PM
484714992c87	cc15d8c4e864	13af88b23f70	Brecht Van Lommel	Build: remove Cycles CUDA/HIP/OPTIX build options on macOS (Show More…)	Dec 7 2021, 6:27 PM
13af88b23f70	c3be88e32329	e14f8c2dd765	Brecht Van Lommel	Build: clean up handling of some Cycles build options (Show More…)	Dec 7 2021, 6:31 PM
e14f8c2dd765	3e37b27e8100	a37dac0a884f	Patrick Mours	Cycles: Reintroduce device-only memory handling that got lost in Cycles X merge (Show More…)	Dec 6 2021, 2:58 PM
a37dac0a884f	8bf3c7fc8a07	fee4b58627da	Sybren A. Stüvel	Cycles: add Metal device type to `device_type_for_description` (Show More…)	Dec 7 2021, 5:47 PM
fee4b58627da	876fe775c882	c4cee2e22180	Sybren A. Stüvel	Cycles: fix build on non-Apple systems (Show More…)	Dec 7 2021, 5:46 PM
c4cee2e22180	8a35687d8635	9558fa519603	Johnny Matthews	Geometry Nodes: Edge Neighbors Node (Show More…)	Dec 7 2021, 5:07 PM
9558fa519603	acc3ed446f70	565b33c0ad31	Michael Jones	Cycles: Metal host-side code (Show More…)	Dec 7 2021, 4:11 PM
565b33c0ad31	1ab797ab034a	a8e0fe6a5423	Jacques Lucke	Geometry Nodes: new Geometry to Instance node (Show More…)	Dec 7 2021, 3:37 PM
a8e0fe6a5423	ca94f6cf889e	2309fa20af41	Jacques Lucke	Geometry Nodes: move type conversions to blenkernel (Show More…)	Dec 7 2021, 3:21 PM
2309fa20af41	5ece68f40841	6a9775ec6fd3	Hans Goudey	Cleanup: Add macro and functions for node storage (Show More…)	Dec 7 2021, 3:09 PM
6a9775ec6fd3	ed4be434d664	0f48b37aae02	Yuchen Wen	Fix T93467: Use world bg color for pose library previews (Show More…)	Dec 7 2021, 2:20 PM
0f48b37aae02	3cbbeb576457	ae5a89e80af7	Jacques Lucke	Revert moving all shader nodes to c++ (Show More…)	Dec 7 2021, 1:26 PM
ae5a89e80af7	14b9144f735f	4312cb854517	Julian Eisel	Fix T93797, T93809: Crash/undefined-behavior when opening demo file (Show More…)	Dec 7 2021, 12:01 PM
4312cb854517	7ca0d50e3768	cd494087c1f2	Julian Eisel	Fix memory leak when loading large asset libraries	Dec 6 2021, 5:46 PM
cd494087c1f2	eed86f5d316f	b069218a5563	Jeroen Bakker	Fix crash when switching back from render preview. (Show More…)	Dec 7 2021, 11:30 AM
b069218a5563	d4079211cbef	e2f0b4a0cbe5	Jeroen Bakker	DrawManager: Engine Instance Data. (Show More…)	Dec 7 2021, 10:33 AM
e2f0b4a0cbe5	7afb67d5b4ad	1de363662427	Jeroen Bakker	Cleanup: Use rcti marking dirty regions when texture painting. (Show More…)	Dec 7 2021, 10:14 AM

This very large diff affects more than 1,000 files. Use the Changeset List to browse changes.

Start of implementation of new texture margin generation.ClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Start of implementation of new texture margin generation.
ClosedPublic
Actions

Revision Contents
Changeset List