From 45da7ce177995e0847ba8bf415505b29e0e1413f Mon Sep 17 00:00:00 2001
From: Stefan Werner <stefan.werner@tangent-animation.com>
Date: Tue, 1 Sep 2020 11:45:22 +0200
Subject: Cycles: Followup fixes for node ownership refactor.

There were some places where nodes still would end up without owners.

See D8540 and 429afe0c626a
---
 intern/cycles/graph/node.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'intern/cycles/graph')

diff --git a/intern/cycles/graph/node.cpp b/intern/cycles/graph/node.cpp
index 14e66959f4f..37387053d97 100644
--- a/intern/cycles/graph/node.cpp
+++ b/intern/cycles/graph/node.cpp
@@ -692,7 +692,8 @@ const NodeOwner *Node::get_owner() const
 
 void Node::set_owner(const NodeOwner *owner_)
 {
-  owner_ = owner;
+  assert(owner_);
+  owner = owner_;
 }
 
 CCL_NAMESPACE_END
-- 
cgit v1.2.3