1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/nodes/geometry/node_geometry_tree.cc b/source/blender/nodes/geometry/node_geometry_tree.cc
index e3998322741..1a12d2c49e6 100644
--- a/source/blender/nodes/geometry/node_geometry_tree.cc
+++ b/source/blender/nodes/geometry/node_geometry_tree.cc
@@ -7,6 +7,7 @@
 #include "NOD_geometry.h"
 
 #include "BKE_context.h"
+#include "BKE_layer.h"
 #include "BKE_node.h"
 #include "BKE_object.h"
 
@@ -31,8 +32,10 @@ static void geometry_node_tree_get_from_context(const bContext *C,
                                                 ID **r_id,
                                                 ID **r_from)
 {
+  const Scene *scene = CTX_data_scene(C);
   ViewLayer *view_layer = CTX_data_view_layer(C);
-  Object *ob = OBACT(view_layer);
+  BKE_view_layer_synced_ensure(scene, view_layer);
+  Object *ob = BKE_view_layer_active_object_get(view_layer);
 
   if (ob == nullptr) {
     return;