[Bf-blender-cvs] [a8540716c91] temp-modifiers-instancing: use separate temp object

[Jacques Lucke]

Commit: a8540716c9174ef11738286f072a75374d62e500
Author: Jacques Lucke
Date:   Wed Nov 11 14:14:55 2020 +0100
Branches: temp-modifiers-instancing
https://developer.blender.org/rBa8540716c9174ef11738286f072a75374d62e500

use separate temp object

===================================================================

M	source/blender/depsgraph/DEG_depsgraph_query.h
M	source/blender/depsgraph/intern/depsgraph_query_iter.cc

===================================================================

diff --git a/source/blender/depsgraph/DEG_depsgraph_query.h b/source/blender/depsgraph/DEG_depsgraph_query.h
index 1d942c4e2a8..2877c378e5f 100644
--- a/source/blender/depsgraph/DEG_depsgraph_query.h
+++ b/source/blender/depsgraph/DEG_depsgraph_query.h
@@ -150,6 +150,7 @@ typedef struct DEGObjectIterData {
   struct Object *geometry_set_owner;
   struct GeometrySetC *geometry_set_c;
   int next_geometry_set_component;
+  struct Object temp_geometry_component_object;
 
   /* **** Iteration over dupli-list. *** */
 
diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
index 36d2c5414fb..dad36260da1 100644
--- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
@@ -299,7 +299,7 @@ void DEG_iterator_objects_next(BLI_Iterator *iter)
         data->next_geometry_set_component = (int)bke::GeometryComponentType::PointCloud;
         const Mesh *mesh = geometry_set->get_mesh_for_read();
         if (mesh != nullptr) {
-          Object *temp_object = &data->temp_dupli_object;
+          Object *temp_object = &data->temp_geometry_component_object;
           *temp_object = *data->geometry_set_owner;
           temp_object->type = OB_MESH;
           temp_object->data = (void *)mesh;
@@ -311,7 +311,7 @@ void DEG_iterator_objects_next(BLI_Iterator *iter)
         data->geometry_set_c = nullptr;
         const PointCloud *pointcloud = geometry_set->get_pointcloud_for_read();
         if (pointcloud != nullptr) {
-          Object *temp_object = &data->temp_dupli_object;
+          Object *temp_object = &data->temp_geometry_component_object;
           *temp_object = *data->geometry_set_owner;
           temp_object->type = OB_POINTCLOUD;
           temp_object->data = (void *)pointcloud;