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 +3 -13
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4a1f8926b5 - Show all commits

16
source/blender/geometry/intern/realize_instances.cc
View File

@ -58,11 +58,6 @@ struct OrderedAttributes {
} }
}; };
struct InstanceListEntry {
int handle;
char *name;
float4x4 transform;
};
struct AttributeFallbacksArray { struct AttributeFallbacksArray {
/** /**
* Instance attribute values used as fallback when the geometry does not have the * Instance attribute values used as fallback when the geometry does not have the
@ -324,25 +319,20 @@ static void realize_collections(Collection *collection, bke::Instances *instance
children_objects.append(collection_object->ob); children_objects.append(collection_object->ob);
} }
Vector<InstanceListEntry> entries;
entries.reserve(children_collections.size() + children_objects.size());
for (Collection *child_collection : children_collections) { for (Collection *child_collection : children_collections) {
float4x4 transform = float4x4::identity(); float4x4 transform = float4x4::identity();
transform.location() += float3(child_collection->instance_offset); transform.location() += float3(child_collection->instance_offset);
transform.location() -= float3(collection->instance_offset); transform.location() -= float3(collection->instance_offset);
const int handle = instances->add_reference(*child_collection); const int handle = instances->add_reference(*child_collection);
entries.append({handle, &(child_collection->id.name[2]), transform}); instances->add_instance(handle, transform);
// entries.append({handle, &(child_collection->id.name[2]), transform});
} }
for (Object *child_object : children_objects) { for (Object *child_object : children_objects) {
const int handle = instances->add_reference(*child_object); const int handle = instances->add_reference(*child_object);
float4x4 transform = float4x4::identity(); float4x4 transform = float4x4::identity();
transform.location() -= float3(collection->instance_offset); transform.location() -= float3(collection->instance_offset);
transform *= float4x4(child_object->object_to_world); transform *= float4x4(child_object->object_to_world);
entries.append({handle, &(child_object->id.name[2]), transform}); instances->add_instance(handle, transform);instances->add_instance(handle, transform);
}
for (const InstanceListEntry &entry : entries) {
instances->add_instance(entry.handle, entry.transform);
} }
} }