diff options
author | Jacques Lucke <jacques@blender.org> | 2021-11-04 20:32:37 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2021-11-04 20:32:37 +0300 |
commit | 101fa4a425d6723c58823484d7e7f3a98acc774f (patch) | |
tree | 77bacd993a89e31829b608d5470b57f1d08fe9e3 | |
parent | 2373ce7fcf998203ae77f6bc1cb37eb4b4d2c5ea (diff) | |
parent | c7fcc50842d85664d2b07c32b181951ea7661440 (diff) |
Merge branch 'blender-v3.0-release'
-rw-r--r-- | intern/cycles/blender/object.cpp | 6 | ||||
-rw-r--r-- | intern/cycles/blender/sync.cpp | 9 | ||||
-rw-r--r-- | intern/cycles/blender/sync.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/node.cc | 13 | ||||
-rw-r--r-- | source/blender/makesrna/intern/makesrna.c | 1 |
5 files changed, 31 insertions, 0 deletions
diff --git a/intern/cycles/blender/object.cpp b/intern/cycles/blender/object.cpp index 9919b9d1836..3800ea0ecd2 100644 --- a/intern/cycles/blender/object.cpp +++ b/intern/cycles/blender/object.cpp @@ -161,6 +161,11 @@ Object *BlenderSync::sync_object(BL::Depsgraph &b_depsgraph, if (is_instance) { persistent_id_array = b_instance.persistent_id(); persistent_id = persistent_id_array.data; + if (!b_ob_info.is_real_object_data()) { + /* Remember which object data the geometry is coming from, so that we can sync it when the + * object has changed. */ + instance_geometries_by_object[b_ob_info.real_object.ptr.data].insert(b_ob_info.object_data); + } } /* light is handled separately */ @@ -560,6 +565,7 @@ void BlenderSync::sync_objects(BL::Depsgraph &b_depsgraph, else { geometry_motion_synced.clear(); } + instance_geometries_by_object.clear(); /* initialize culling */ BlenderObjectCulling culling(scene, b_scene); diff --git a/intern/cycles/blender/sync.cpp b/intern/cycles/blender/sync.cpp index cf0b77a9b16..ffd1e78b7f8 100644 --- a/intern/cycles/blender/sync.cpp +++ b/intern/cycles/blender/sync.cpp @@ -183,6 +183,15 @@ void BlenderSync::sync_recalc(BL::Depsgraph &b_depsgraph, BL::SpaceView3D &b_v3d (object_subdivision_type(b_ob, preview, experimental) != Mesh::SUBDIVISION_NONE)) { BL::ID key = BKE_object_is_modified(b_ob) ? b_ob : b_ob.data(); geometry_map.set_recalc(key); + + /* Sync all contained geometry instances as well when the object changed.. */ + map<void *, set<BL::ID>>::const_iterator instance_geometries = + instance_geometries_by_object.find(b_ob.ptr.data); + if (instance_geometries != instance_geometries_by_object.end()) { + for (BL::ID geometry : instance_geometries->second) { + geometry_map.set_recalc(geometry); + } + } } if (updated_geometry) { diff --git a/intern/cycles/blender/sync.h b/intern/cycles/blender/sync.h index c2377406876..7e5d0324ca9 100644 --- a/intern/cycles/blender/sync.h +++ b/intern/cycles/blender/sync.h @@ -225,6 +225,8 @@ class BlenderSync { set<Geometry *> geometry_synced; set<Geometry *> geometry_motion_synced; set<Geometry *> geometry_motion_attribute_synced; + /** Remember which geometries come from which objects to be able to sync them after changes. */ + map<void *, set<BL::ID>> instance_geometries_by_object; set<float> motion_times; void *world_map; bool world_recalc; diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc index 688005454c8..5ba4bbfc02b 100644 --- a/source/blender/blenkernel/intern/node.cc +++ b/source/blender/blenkernel/intern/node.cc @@ -4591,6 +4591,15 @@ static OutputFieldDependency get_interface_output_field_dependency(const NodeRef return socket_decl.output_field_dependency(); } +static FieldInferencingInterface get_dummy_field_inferencing_interface(const NodeRef &node) +{ + FieldInferencingInterface inferencing_interface; + inferencing_interface.inputs.append_n_times(InputSocketFieldType::None, node.inputs().size()); + inferencing_interface.outputs.append_n_times(OutputFieldDependency::ForDataSource(), + node.outputs().size()); + return inferencing_interface; +} + /** * Retrieves information about how the node interacts with fields. * In the future, this information can be stored in the node declaration. This would allow this @@ -4604,6 +4613,10 @@ static FieldInferencingInterface get_node_field_inferencing_interface(const Node if (group == nullptr) { return FieldInferencingInterface(); } + if (!ntreeIsRegistered(group)) { + /* This can happen when there is a linked node group that was not found (see T92799). */ + return get_dummy_field_inferencing_interface(node); + } if (group->field_inferencing_interface == nullptr) { /* Update group recursively. */ update_field_inferencing(*group); diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index 36f19907080..f2e87b29c1f 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -4792,6 +4792,7 @@ static const char *cpp_classes = "\n" " bool operator==(const Pointer &other) const { return ptr.data == other.ptr.data; }\n" " bool operator!=(const Pointer &other) const { return ptr.data != other.ptr.data; }\n" + " bool operator<(const Pointer &other) const { return ptr.data < other.ptr.data; }\n" "\n" " PointerRNA ptr;\n" "};\n" |