aryeramaty/blender
0
0
Fork 1
forked from blender/blender
Code Pull Requests Activity

davidhaver-WIP-realize-depth #3

Closed
David-Haver wants to merge 65 commits from David-Haver/blender-old:davidhaver-WIP-realize-depth into WIP-realize-depth
pull from: David-Haver/blender-old:davidhaver-WIP-realize-depth
merge into: aryeramaty:WIP-realize-depth

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 65 Files Changed 5 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9ed9a816a4 - Show all commits

2
source/blender/geometry/intern/join_geometries.cc
View File

@ -185,7 +185,7 @@ static void join_component_type(const bke::GeometryComponent::Type component_typ
options.keep_original_ids = true; options.keep_original_ids = true;
options.realize_instance_attributes = false; options.realize_instance_attributes = false;
options.propagation_info = propagation_info; options.propagation_info = propagation_info;
options.depths = VArray<int>::ForSingle(99, instances.get()->instances_num()); options.depths = VArray<int>::ForSingle(-1, instances.get()->instances_num());
IndexMaskMemory memory; IndexMaskMemory memory;
options.selection = IndexMask::from_bools( options.selection = IndexMask::from_bools(
VArray<bool>::ForSingle(true, instances.get()->instances_num()), memory); VArray<bool>::ForSingle(true, instances.get()->instances_num()), memory);

2
source/blender/nodes/geometry/nodes/node_geo_realize_instances.cc
View File

@ -25,7 +25,7 @@ static void node_declare(NodeDeclarationBuilder &b)
.default_value(true) .default_value(true)
.supports_field() .supports_field()
.description(("Determine wether to realize nested instances completly")); .description(("Determine wether to realize nested instances completly"));
b.add_input<decl::Int>("Depth").default_value(99).min(0).supports_field().description( b.add_input<decl::Int>("Depth").default_value(0).min(0).supports_field().description(
("Number of levels of nested instances to realize for each top-level instance")); ("Number of levels of nested instances to realize for each top-level instance"));
b.add_output<decl::Geometry>("Geometry").propagate_all(); b.add_output<decl::Geometry>("Geometry").propagate_all();
} }