Paths

Table of Contentst

Differential D13303

Start of implementation of new texture margin generation.
ClosedPublic
Actions

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

Details

Reviewers

Brecht Van Lommel (brecht)

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 19000
Build 19000: 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
781–787	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
2046	`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
781–787	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

Large Diff

This large diff affects 120 files. Files without inline comments have been collapsed. Expand All Files

Revision Contents
Changeset List

Path

Size

CMakeLists.txt

7 lines

intern/

cycles/

blender/

addon/

2 lines

21 lines

10 lines

8 lines

8 lines

integrator/

path_trace.cpp

6 lines

path_trace_work_gpu.cpp

3 lines

render_scheduler.cpp

3 lines

tile.h

3 lines

tile.cpp

5 lines

work_tile_scheduler.h

6 lines

work_tile_scheduler.cpp

7 lines

kernel/

device/

gpu/

kernel.h

29 lines

work_stealing.h

25 lines

film/

read.h

2 lines

test/

integrator_tile_test.cpp

16 lines

source/

blender/

blenkernel/

BKE_mesh_mirror.h

10 lines

CMakeLists.txt

3 lines

intern/

anim_path.c

4 lines

armature_update.c

90 lines

attribute_access.cc

7 lines

blendfile_link_append.c

12 lines

bpath_test.cc

181 lines

geometry_component_curve.cc

214 lines

geometry_component_mesh.cc

43 lines

image.c

6 lines

image_gpu.c

	image_gpu.cc
	image_gpu.c

112 lines

mesh_mirror.c

46 lines

blenlib/

BLI_virtual_array.hh

196 lines

editors/

gpencil/

13 lines

2 lines

2 lines

11 lines

10 lines

4 lines

include/

UI_interface.h

8 lines

UI_tree_view.hh

2 lines

interface/

15 lines

10 lines

2 lines

38 lines

40 lines

6 lines

mask/

mask_draw.c

56 lines

mesh/

editface.c

2 lines

object/

object_bake_api.c

42 lines

object_remesh.cc

3 lines

screen/

area.c

13 lines

sculpt_paint/

paint_image_proj.c

5 lines

space_file/

asset_catalog_tree_view.cc

32 lines

filesel.c

6 lines

space_view3d/

view3d_utils.c

11 lines

transform/

transform.h

2 lines

transform_generics.c

30 lines

transform_mode.c

2 lines

functions/

CMakeLists.txt

3 lines

FN_cpp_type.hh

12 lines

FN_generic_virtual_array.hh

26 lines

FN_multi_function.hh

28 lines

FN_multi_function_parallel.hh

FN_multi_function_params.hh

29 lines

FN_multi_function_procedure_executor.hh

3 lines

intern/

field.cc

10 lines

generic_virtual_array.cc

171 lines

multi_function.cc

133 lines

multi_function_parallel.cc

multi_function_params.cc

44 lines

multi_function_procedure_executor.cc

10 lines

gpu/

intern/

gpu_viewport.c

11 lines

imbuf/

intern/

filter.c

6 lines

makesdna/

DNA_modifier_defaults.h

1 line

DNA_modifier_types.h

10 lines

makesrna/

intern/

rna_linestyle.c

9 lines

modifiers/

intern/

MOD_mirror.c

10 lines

MOD_nodes_evaluator.cc

26 lines

nodes/

NOD_geometry_exec.hh

4 lines

geometry/

nodes/

legacy/

node_geo_legacy_attribute_convert.cc

2 lines

node_geo_legacy_attribute_randomize.cc

2 lines

node_geo_legacy_attribute_transfer.cc

2 lines

node_geo_legacy_curve_endpoints.cc

6 lines

node_geo_legacy_mesh_to_curve.cc

4 lines

node_geo_legacy_point_distribute.cc

8 lines

node_geo_attribute_statistic.cc

25 lines

node_geo_collection_info.cc

7 lines

node_geo_convex_hull.cc

2 lines

node_geo_curve_fillet.cc

7 lines

node_geo_curve_length.cc

2 lines

node_geo_curve_primitive_circle.cc

2 lines

node_geo_curve_primitive_quadrilateral.cc

2 lines

node_geo_curve_primitive_spiral.cc

2 lines

node_geo_curve_resample.cc

2 lines

node_geo_curve_sample.cc

18 lines

node_geo_delete_geometry.cc

120 lines

node_geo_image_texture.cc

11 lines

node_geo_instances_to_points.cc

2 lines

node_geo_mesh_primitive_circle.cc

2 lines

node_geo_mesh_primitive_cone.cc

16 lines

node_geo_mesh_primitive_cube.cc

2 lines

node_geo_mesh_primitive_cylinder.cc

16 lines

node_geo_mesh_primitive_grid.cc

2 lines

node_geo_mesh_primitive_uv_sphere.cc

2 lines

node_geo_mesh_subdivide.cc

2 lines

node_geo_object_info.cc

12 lines

node_geo_points_to_volume.cc

2 lines

node_geo_proximity.cc

8 lines

node_geo_raycast.cc

20 lines

node_geo_set_position.cc

89 lines

node_geo_transfer_attribute.cc

8 lines

intern/

node_common.cc

2 lines

node_geometry_exec.cc

5 lines

shader/

nodes/

node_shader_tex_noise.cc

8 lines

node_shader_tex_voronoi.cc

19 lines

python/

intern/

bpy_props.c

10 lines

render/

CMakeLists.txt

2 lines

RE_bake.h

3 lines

intern/

bake.c

11 lines

texture_margin.cc

593 lines

	render/
	functions/

	RE_texture_margin.h
	FN_multi_function_parallel.hh

33 lines

Commit	Tree	Parents	Author	Summary	Date
60b54787d763	8a383e931ccf	f46ed2e229be	martijn	clang-format	Nov 26 2021, 10:35 PM
f46ed2e229be	94028575c3e6	07937e9b9975	Martijn Versteegh	Document the entrypoint.	Nov 26 2021, 10:20 PM
07937e9b9975	c4d3cc0133af	e6ef14f528c4	Martijn Versteegh	Todolist comment amended.	Nov 26 2021, 10:14 PM
e6ef14f528c4	37dcd6a4e402	54c03afc0812	Martijn Versteegh	Some more variable renaming and an extra comment added.	Nov 26 2021, 10:12 PM
54c03afc0812	0c4492fa3d6d	4a56fbb6d08f	Martijn Versteegh	Layout.	Nov 26 2021, 10:11 PM
4a56fbb6d08f	5f5ecb3667dd	4e4ef3919471	Martijn Versteegh	Add some comments.	Nov 26 2021, 10:10 PM
4e4ef3919471	c9af5525ffdd	3d48d4fb08cc	Martijn Versteegh	Convert from uv to pixel coordinates in a consitent way.	Nov 26 2021, 9:31 PM
3d48d4fb08cc	2498282af89d	b2a06aa2bead	Martijn Versteegh	Renamed variables to be in line with the blender style guide.	Nov 26 2021, 9:26 PM
b2a06aa2bead	3e945f7d051f	63a87bcdd117	Martijn Versteegh	Renamed functions to follow the blender stylle guide.	Nov 26 2021, 9:15 PM
63a87bcdd117	d8a778bcc0fd	f708f18bdbf2	Martijn Versteegh	Replace std::vector with blender::Vector .	Nov 26 2021, 9:07 PM
f708f18bdbf2	a8c411ee7e7c	9b67baac9030	martijn	Make sure the final extend step doesn't mess up the interior of our texture.	Nov 26 2021, 4:36 PM
9b67baac9030	70d45a4f40f1	614f9cc91270	martijn	Replace the custom datatypes from the prototype with a single mapping array. (Show More…)	Nov 26 2021, 4:32 PM
614f9cc91270	8dd95e7e1a3f	17c0382493bd	Martijn Versteegh	Add some comments.	Nov 25 2021, 8:57 PM
17c0382493bd	3a72af36808d	666a3e8b4790	Martijn Versteegh	Change the namespace to be in line with the codestyle guidelines.	Nov 25 2021, 8:56 PM
666a3e8b4790	a4afe78b23f5	c012d9c256e2	Martijn Versteegh	Use only unsigned ints where they really need to be unsigned.	Nov 25 2021, 7:40 PM
c012d9c256e2	482d33a99cd2	eae380f285be	Martijn Versteegh	Change all doubles to floats. (Show More…)	Nov 25 2021, 7:19 PM
eae380f285be	b6d4168ef9cd	24bbaf6717b7	Martijn Versteegh	Move system includes to after blender includes.	Nov 25 2021, 7:05 PM
24bbaf6717b7	b89f4204e578	c6b14d8531e3	Martijn Versteegh	Code cleanup. Get rid of static globals.	Nov 25 2021, 2:38 PM
c6b14d8531e3	653fdb8d1acf	62178b8ee29a	martijn	Use the IMB_filter_extend filter to fill in the missing parts. (Show More…)	Nov 24 2021, 11:06 PM
62178b8ee29a	ee2e3a5c9cff	854b50269ab6	martijn	Do all calculations in pixel space instead of uv space.	Nov 24 2021, 9:33 AM
854b50269ab6	3415689e1767	ff6f328a1d3a	martijn	Look up pixels in multiple polygons, if the margin is wider than the next… (Show More…)	Nov 23 2021, 7:50 PM
ff6f328a1d3a	ad6040018482	d5065664e073	martijn	Only mirror on edges which are facing towards us. (Show More…)	Nov 23 2021, 10:14 AM
d5065664e073	b180dbbc57f8	8ca2f559adc5	martijn	Fix a typo, lots of debugging help start with xtending the old way to help… (Show More…)	Nov 22 2021, 11:24 PM
8ca2f559adc5	b0c06915ba12	facaea7083e3	martijn	Reimplement (with lots of copypasting) the prototype inside blender	Nov 21 2021, 11:00 PM
facaea7083e3	d74f8e150cdb	08264aaf82da	martijn	Start of implementation of new texture margin generation. (Show More…)	Nov 19 2021, 3:42 PM
08264aaf82da	4b91a319fa6c	61bd5882a20c	Bastien Montagne	Attempt to fix Windows new bpath tests failing, take III. (Show More…)	Nov 26 2021, 10:07 PM
61bd5882a20c	e2af95fd7c0e	a0bb6bb4d69d	Bastien Montagne	Attempt to fix Windows new bpath tests failing, take II. (Show More…)	Nov 26 2021, 9:34 PM
a0bb6bb4d69d	999d7f091c0a	97465046c6bb	Sebastian Parborg	Fix T89564: Spline IK breaks when it is far away from the world origin (Show More…)	Nov 26 2021, 6:20 PM
97465046c6bb	d1c597d5d63f	92daff6ac2ad	Jacques Lucke	Geometry Nodes: add utility to set remaining outputs (Show More…)	Nov 26 2021, 6:00 PM
92daff6ac2ad	f5ccf9bb4a2a	2efc2221cc0d	Bastien Montagne	Attempt to fix Windows new bpath tests failing. (Show More…)	Nov 26 2021, 5:57 PM
2efc2221cc0d	280475b95dee	0789f61373de	Bastien Montagne	Fix T93402: Linking Collections instantiate extra sub-collections. (Show More…)	Nov 26 2021, 5:47 PM
0789f61373de	90bac7357686	602ecbdf9aef	Jacques Lucke	Cleanup: remove warnings (Show More…)	Nov 26 2021, 5:32 PM
602ecbdf9aef	91a9c05b13f4	eb7827e7970c	Jacques Lucke	Geometry Nodes: optimize Set Position node (Show More…)	Nov 26 2021, 3:33 PM
eb7827e7970c	d64e14d38642	12a83db83c5e	Michael Jones	Cycles: Fix film convert address space mismatch on Metal (Show More…)	Nov 24 2021, 9:34 PM
12a83db83c5e	2775880b1622	f86331a0338d	Germano Cavalcante	Fix T93290: Rotation without contraint after extrude has wrong axis (Show More…)	Nov 26 2021, 2:45 PM
f86331a0338d	d67fb1d4baaf	ef88047a97a1	Jacques Lucke	Geometry Nodes: deduplicate virtual array implementations (Show More…)	Nov 26 2021, 2:47 PM
ef88047a97a1	021afa630422	a773cd3850ee	Philipp Oeser	Fix T89081: Freestyle noise seed of zero crash (Show More…)	Nov 23 2021, 12:27 PM
a773cd3850ee	9f20da251d33	35c3644e78d3	Philipp Oeser	Fix T93130: Frame Selected with selected paint mask does not work (Show More…)	Nov 16 2021, 8:25 PM
35c3644e78d3	062e156067e3	63342861e7c1	Philipp Oeser	Fix T93117: Texture paint clone tool crash in certain situation (Show More…)	Nov 26 2021, 10:00 AM
63342861e7c1	57eb6d402429	b066d5821607	Jacques Lucke	Fix: error in previous commit (Show More…)	Nov 26 2021, 1:29 PM
b066d5821607	d0b429e802fc	236be8e9f1c9	Dalai Felinto	CMake mini-rewrite: Sync code check with BKE_blender_version_is_alpha (Show More…)	Nov 26 2021, 9:33 AM
236be8e9f1c9	5b6bf4cdfe97	dcc500e5a265	Philipp Oeser	Fix T93380: Texture paint clone tool crash without clone image (Show More…)	Nov 26 2021, 8:33 AM
dcc500e5a265	1d5abdebeac9	c6eaa9c552eb	Bastien Montagne	BKE_bpath: Add minimal unittests. (Show More…)	Nov 26 2021, 11:06 AM
c6eaa9c552eb	3763448f8719	658fd8df0bd2	Simon Lenz	MaskEditor: draw active layer on top (Show More…)	Nov 26 2021, 11:01 AM
658fd8df0bd2	574c5a6f4c11	004172de38d5	Jacques Lucke	Geometry Nodes: refactor multi-threading in field evaluation (Show More…)	Nov 26 2021, 11:05 AM
004172de38d5	d9e03972b3ac	6b5e1cfacab4	Martijn Versteegh	Clarify a confusing comment. (Show More…)	Nov 26 2021, 10:56 AM
6b5e1cfacab4	e9823126bbe8	2cda65a35a61	Jacques Lucke	Geometry Nodes: better devirtualization for sliced virtual arrays (Show More…)	Nov 26 2021, 10:08 AM
2cda65a35a61	9d9460de93f1	8015433f81b4	Jacques Lucke	Geometry Nodes: avoid allocation when construct varray for single value (Show More…)	Nov 26 2021, 9:59 AM
8015433f81b4	806aa68acae3	e3cf7ebdb1c4	Jeroen Bakker	Cleanup: Migrate `image_gpu.cc` to CC. (Show More…)	Nov 26 2021, 8:16 AM
e3cf7ebdb1c4	6fad0ccd4ee2	a073e1e401b3	Jeroen Bakker	Cleanup: Silence clang-tidy warning.	Nov 26 2021, 8:00 AM
a073e1e401b3	a42beac47df5	7b5a6f452aa5	Jeroen Bakker	Cleanup: Silence clang-tidy warnings.	Nov 26 2021, 7:59 AM
7b5a6f452aa5	dba7e1710945	466b50dbc9f0 2fb8c6805a98	Brecht Van Lommel	Merge branch 'blender-v3.0-release'	Nov 25 2021, 6:33 PM
466b50dbc9f0	31b112b02aa6	e3d3296327e9	Brecht Van Lommel	Cycles: expose direct light sampling option in Debug panel, tweak panel layout	Nov 25 2021, 2:32 PM
2fb8c6805a98	8c11eddf85c9	e6a41e1c806b	Brecht Van Lommel	Fix build error with experimental features after recent release cycle bump (Show More…)	Nov 25 2021, 6:22 PM
e3d3296327e9	55e27fc6c184	4a3f99ad5a2e e6a41e1c806b	Dalai Felinto	Merge remote-tracking branch 'origin/blender-v3.0-release' (Show More…)	Nov 25 2021, 6:00 PM
e6a41e1c806b	4af537794f71	b2bb3e4b722b	Dalai Felinto	Blender 3.0 bcon4 - change release cycle to release candidate (Show More…)	Nov 25 2021, 5:59 PM
b2bb3e4b722b	8d3438359b3d	5a11c6e558c6	Philipp Oeser	Fix T90082: Autoscrolling after renaming in the File Browser broken (Show More…)	Nov 25 2021, 5:31 PM
4a3f99ad5a2e	295575c89f24	3652f5f758aa 5a11c6e558c6	Julian Eisel	Merge branch 'blender-v3.0-release'	Nov 25 2021, 5:26 PM
5a11c6e558c6	87bb8fcec8b7	5514ca58a4d4	Julian Eisel	Fix missing margin below panels (Show More…)	Nov 25 2021, 5:15 PM
5514ca58a4d4	7d3996161a38	94e8db1e869d	Julian Eisel	Fix T92313: Heading of redo panel is not aligned properly (Show More…)	Nov 25 2021, 4:53 PM
94e8db1e869d	415ea1d9d41a	c91d1961596e	Julian Eisel	Fix T92278: Small size of previews in the shading popover (Show More…)	Nov 25 2021, 3:51 PM
3652f5f758aa	cde6022d7474	9812a08848b8 c91d1961596e	Sybren A. Stüvel	Merge remote-tracking branch 'origin/blender-v3.0-release'	Nov 25 2021, 3:22 PM
c91d1961596e	ad2952478500	e253fb2143e2	Sybren A. Stüvel	Fix T93274: Assigning asset catalog doesn't mark file as modified (Show More…)	Nov 25 2021, 3:01 PM
9812a08848b8	476cc725f3a6	e216660382e4	Erik	Fix: Crash when muting the Group Output node (Show More…)	Nov 25 2021, 3:01 PM
e216660382e4	c823e3fc85c3	2378f057a050 e253fb2143e2	Bastien Montagne	Merge branch 'blender-v3.0-release' (Show More…)	Nov 25 2021, 3:00 PM
e253fb2143e2	e5eff31bb1df	3bf10e5d0ac2	Bastien Montagne	Fix T93353: Reload Library used as source for liboverride loses Constraints. (Show More…)	Nov 25 2021, 2:50 PM
3bf10e5d0ac2	30e6d1571832	ffddf9e5c917	Brecht Van Lommel	Fix T89996, T90063: bugs with multi-button reset and entering values in popups (Show More…)	Nov 25 2021, 2:15 PM
2378f057a050	3add8c40ddc2	bc4c20d414e9 ffddf9e5c917	Philipp Oeser	Merge branch 'blender-v3.0-release'	Nov 25 2021, 2:21 PM
bc4c20d414e9	add30daf5016	447378753d32	Germano Cavalcante	Fix T93360: 'Iteractive Light Track' do not work over empty background (Show More…)	Nov 25 2021, 2:17 PM
ffddf9e5c917	ed6efd177f93	845716e60027	Philipp Oeser	Fix T93338: Curve Guide force field crash (Show More…)	Nov 25 2021, 1:45 PM
447378753d32	a4ee8945716f	d6646f7a8a67	Jacques Lucke	BLI: remove special cases for is_span and is_single methods (Show More…)	Nov 25 2021, 1:51 PM
845716e60027	07405d0447af	82808e18e656	Clément Foucault	Fix T92609 Default Compositing tab shows red overlay when stereoscopy is turned… (Show More…)	Nov 25 2021, 1:40 PM
d6646f7a8a67	da05a73f5ec9	1e2376f41f5a	Jacques Lucke	Fix T93367: wrong attribute propagation in Delete Geometry node (Show More…)	Nov 25 2021, 11:32 AM
1e2376f41f5a	3f7531f5c50f	5ffb9b6dc45f 82808e18e656	Jacques Lucke	Merge branch 'blender-v3.0-release'	Nov 25 2021, 10:36 AM
82808e18e656	5a0ffc23b4ee	a0acb9bd0cc0	Jacques Lucke	Fix T93362: crash when capturing attribute after fillet curve node (Show More…)	Nov 25 2021, 10:33 AM
5ffb9b6dc45f	792b650f8466	610e68590b7f a0acb9bd0cc0	Sergey Sharybin	Merge remote-tracking branch 'origin/blender-v3.0-release'	Nov 25 2021, 10:22 AM
a0acb9bd0cc0	b9e9b798f744	e6cd4761e7c3	Bastien Montagne	Fix T91444: Edge Loop Preview fails with two Mirror Modifiers (Show More…)	Nov 12 2021, 8:07 AM
e6cd4761e7c3	fc7b4e80a020	726bc3a46b2f	Bastien Montagne	Fix T93321: Modified Mirror modifier behavior break some other tools like bound… (Show More…)	Nov 24 2021, 4:20 PM
726bc3a46b2f	eb79ca0b9c68	ce5561b81536	Sergey Sharybin	Fix T93155: Approximate shadow catcher displayed wrong on CPU and GPU (Show More…)	Nov 24 2021, 5:06 PM
610e68590b7f	13763591eeec	f12a6ff5cb4d ce5561b81536	Bastien Montagne	Merge branch 'blender-v3.0-release'	Nov 25 2021, 10:12 AM
ce5561b81536	00988a43c7c1	40d28b40dfd0	Bastien Montagne	Fix Py API: wrong doc about type of Collection property. (Show More…)	Nov 25 2021, 10:10 AM
f12a6ff5cb4d	31155c065bec	c49d2cbe92a1 40d28b40dfd0	Sergey Sharybin	Merge branch 'blender-v3.0-release'	Nov 25 2021, 9:51 AM
40d28b40dfd0	661e6f14a44e	b41c72b710d4	Sergey Sharybin	Fix black Cycles result when cancelling tiled rendering with shadow catcher (Show More…)	Nov 24 2021, 3:52 PM
c49d2cbe92a1	ab585ec4daf8	827c5b399e0b b41c72b710d4	William Leeson	Merge branch 'blender-v3.0-release' to bring in D13042: Fix performance… (Show More…)	Nov 25 2021, 9:41 AM
b41c72b710d4	9e8097c772e6	8f2db94627d5	Alaska	Fix performance decrease with Scrambling Distance on (Show More…)	Nov 25 2021, 9:20 AM
827c5b399e0b	0936eaf61c61	c26011efcbe1 8f2db94627d5	Jacques Lucke	Merge branch 'blender-v3.0-release'	Nov 25 2021, 12:04 AM
8f2db94627d5	3d2bc48f430b	a9642f8d6130	Jacques Lucke	Fix T93357: crash when opening search menu (Show More…)	Nov 25 2021, 12:03 AM

Start of implementation of new texture margin generation.ClosedPublicActions

Details

Diff Detail

Event Timeline

Large Diff

Revision ContentsChangeset List

Diff 45333

CMakeLists.txt

intern/cycles/blender/addon/properties.py

intern/cycles/blender/addon/ui.py

intern/cycles/blender/curves.cpp

intern/cycles/blender/geometry.cpp

intern/cycles/blender/python.cpp

intern/cycles/integrator/path_trace.cpp

intern/cycles/integrator/path_trace_work_gpu.cpp

intern/cycles/integrator/render_scheduler.cpp

intern/cycles/integrator/tile.h

intern/cycles/integrator/tile.cpp

intern/cycles/integrator/work_tile_scheduler.h

intern/cycles/integrator/work_tile_scheduler.cpp

intern/cycles/kernel/device/gpu/kernel.h

intern/cycles/kernel/device/gpu/work_stealing.h

intern/cycles/kernel/film/read.h

intern/cycles/test/integrator_tile_test.cpp

source/blender/blenkernel/BKE_mesh_mirror.h

source/blender/blenkernel/CMakeLists.txt

source/blender/blenkernel/intern/anim_path.c

source/blender/blenkernel/intern/armature_update.c

source/blender/blenkernel/intern/attribute_access.cc

source/blender/blenkernel/intern/blendfile_link_append.c

source/blender/blenkernel/intern/bpath_test.cc

source/blender/blenkernel/intern/geometry_component_curve.cc

source/blender/blenkernel/intern/geometry_component_mesh.cc

source/blender/blenkernel/intern/image.c

source/blender/blenkernel/intern/image_gpu.c

source/blender/blenkernel/intern/image_gpu.cc

source/blender/blenkernel/intern/mesh_mirror.c

source/blender/blenlib/BLI_virtual_array.hh

source/blender/editors/gpencil/annotate_paint.c

source/blender/editors/gpencil/gpencil_fill.c

source/blender/editors/gpencil/gpencil_intern.h

source/blender/editors/gpencil/gpencil_paint.c

source/blender/editors/gpencil/gpencil_primitive.c

source/blender/editors/gpencil/gpencil_utils.c

source/blender/editors/include/UI_interface.h

source/blender/editors/include/UI_tree_view.hh

source/blender/editors/interface/interface.c

source/blender/editors/interface/interface_handlers.c

source/blender/editors/interface/interface_ops.c

source/blender/editors/interface/interface_panel.c

source/blender/editors/interface/interface_widgets.c

source/blender/editors/interface/tree_view.cc

source/blender/editors/mask/mask_draw.c

source/blender/editors/mesh/editface.c

source/blender/editors/object/object_bake_api.c

source/blender/editors/object/object_remesh.cc

source/blender/editors/screen/area.c

source/blender/editors/sculpt_paint/paint_image_proj.c

source/blender/editors/space_file/asset_catalog_tree_view.cc

source/blender/editors/space_file/filesel.c

source/blender/editors/space_view3d/view3d_utils.c

source/blender/editors/transform/transform.h

source/blender/editors/transform/transform_generics.c

source/blender/editors/transform/transform_mode.c

source/blender/functions/CMakeLists.txt

source/blender/functions/FN_cpp_type.hh

source/blender/functions/FN_generic_virtual_array.hh

source/blender/functions/FN_multi_function.hh

source/blender/functions/FN_multi_function_parallel.hh

source/blender/functions/FN_multi_function_params.hh

source/blender/functions/FN_multi_function_procedure_executor.hh

source/blender/functions/intern/field.cc

source/blender/functions/intern/generic_virtual_array.cc

source/blender/functions/intern/multi_function.cc

source/blender/functions/intern/multi_function_parallel.cc

source/blender/functions/intern/multi_function_params.cc

source/blender/functions/intern/multi_function_procedure_executor.cc

source/blender/gpu/intern/gpu_viewport.c

source/blender/imbuf/intern/filter.c

source/blender/makesdna/DNA_modifier_defaults.h

Start of implementation of new texture margin generation.
ClosedPublic
Actions

Revision Contents
Changeset List