[Bf-blender-cvs] [26a72f0852a] blender2.8: Cycles: Fix after recent merge from master

[Dalai Felinto]

Commit: 26a72f0852a75535f8e4ea72100e735409b1407f
Author: Dalai Felinto
Date:   Wed Nov 15 09:50:51 2017 -0200
Branches: blender2.8
https://developer.blender.org/rB26a72f0852a75535f8e4ea72100e735409b1407f

Cycles: Fix after recent merge from master

random_id() crashes when there is no current dupli object.

We could also throw a Python error when doing it via RNA, but as far as
Cycles is concerned we need to check if instanced.

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

M	intern/cycles/blender/blender_object.cpp

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

diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp
index ee153b8602d..986f0ccda68 100644
--- a/intern/cycles/blender/blender_object.cpp
+++ b/intern/cycles/blender/blender_object.cpp
@@ -295,7 +295,7 @@ Object *BlenderSync::sync_object(BL::Depsgraph::duplis_iterator& b_dupli_iter,
 			           persistent_id,
 			           b_ob,
 			           b_ob_instance,
-			           b_dupli_iter->random_id(),
+			           is_instance ? b_dupli_iter->random_id() : 0,
 			           tfm,
 			           use_portal);
 		}