[Bf-blender-cvs] [7df7a8f3f1b] blender-v2.81-release: Fix T70838: crash on cycles render after recent fix

[Dalai Felinto]

Commit: 7df7a8f3f1bbd894febc102e339aa03e59d363b9
Author: Dalai Felinto
Date:   Tue Oct 15 10:12:52 2019 -0300
Branches: blender-v2.81-release
https://developer.blender.org/rB7df7a8f3f1bbd894febc102e339aa03e59d363b9

Fix T70838: crash on cycles render after recent fix

My bad for not figuring out how to run our unittests since I got back to
Windows.

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

M	intern/cycles/blender/blender_object.cpp
M	source/blender/blenkernel/intern/layer.c

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

diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp
index d3efc18a990..5520cfd5ecf 100644
--- a/intern/cycles/blender/blender_object.cpp
+++ b/intern/cycles/blender/blender_object.cpp
@@ -555,7 +555,7 @@ void BlenderSync::sync_objects(BL::Depsgraph &b_depsgraph,
     /* test if object needs to be hidden */
     const bool show_self = b_instance.show_self();
     const bool show_particles = b_instance.show_particles();
-    const bool show_in_viewport = b_ob.visible_in_viewport_get(b_v3d);
+    const bool show_in_viewport = !b_v3d || b_ob.visible_in_viewport_get(b_v3d);
 
     if (show_in_viewport && (show_self || show_particles)) {
       /* object itself */
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index b915fddca18..fd5b4b6e506 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -1061,6 +1061,8 @@ bool BKE_base_is_visible(const View3D *v3d, const Base *base)
 
 bool BKE_object_is_visible_in_viewport(const struct View3D *v3d, const struct Object *ob)
 {
+  BLI_assert(v3d != NULL);
+
   if (ob->restrictflag & OB_RESTRICT_VIEWPORT) {
     return false;
   }