[Bf-blender-cvs] [954af8c1824] master: Geometry Nodes: missing null check for volume objects

[Jacques Lucke]

Commit: 954af8c1824949114fc15258743de7036e676ec1
Author: Jacques Lucke
Date:   Fri Jan 29 11:43:47 2021 +0100
Branches: master
https://developer.blender.org/rB954af8c1824949114fc15258743de7036e676ec1

Geometry Nodes: missing null check for volume objects

The problem was found by Dalai in T84606.

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

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

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

diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
index c9780b9b129..34465c12914 100644
--- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
@@ -207,13 +207,15 @@ bool deg_iterator_components_step(BLI_Iterator *iter)
     if (component != nullptr) {
       const Volume *volume = component->get_for_read();
 
-      Object *temp_object = &data->temp_geometry_component_object;
-      *temp_object = *data->geometry_component_owner;
-      temp_object->type = OB_VOLUME;
-      temp_object->data = (void *)volume;
-      temp_object->runtime.select_id = data->geometry_component_owner->runtime.select_id;
-      iter->current = temp_object;
-      return true;
+      if (volume != nullptr) {
+        Object *temp_object = &data->temp_geometry_component_object;
+        *temp_object = *data->geometry_component_owner;
+        temp_object->type = OB_VOLUME;
+        temp_object->data = (void *)volume;
+        temp_object->runtime.select_id = data->geometry_component_owner->runtime.select_id;
+        iter->current = temp_object;
+        return true;
+      }
     }
   }