From 8dc2fbd7b666b6cf0477627249f1a2b6a4924e9e Mon Sep 17 00:00:00 2001
From: Jacques Lucke <jacques@blender.org>
Date: Thu, 30 Jul 2020 18:22:29 +0200
Subject: Fix T79117: dependency cycle with passive rigid body objects

Reviewers: zeddb

Differential Revision: D8431
---
 source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'source/blender/depsgraph/intern/builder/deg_builder_nodes.cc')

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 57bc673a521..390e996b63f 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -1126,6 +1126,12 @@ void DepsgraphNodeBuilder::build_rigidbody(Scene *scene)
       if (object->type != OB_MESH) {
         continue;
       }
+      if (object->rigidbody_object == nullptr) {
+        continue;
+      }
+      if (object->rigidbody_object->type == RBO_TYPE_PASSIVE) {
+        continue;
+      }
       /* Create operation for flushing results. */
       /* Object's transform component - where the rigidbody operation
        * lives. */
-- 
cgit v1.2.3