diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2019-10-15 16:12:52 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2019-10-15 16:18:11 +0300 |
commit | 7df7a8f3f1bbd894febc102e339aa03e59d363b9 (patch) | |
tree | 03f681d5481b2afc9c109f588f328a20b0fdb951 /intern/cycles/blender/blender_object.cpp | |
parent | 4d3a3172582dea2d3dfe122e05b38640fed441b6 (diff) |
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.
Diffstat (limited to 'intern/cycles/blender/blender_object.cpp')
-rw-r--r-- | intern/cycles/blender/blender_object.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |