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 /source/blender/blenkernel/intern/layer.c | |
| 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 'source/blender/blenkernel/intern/layer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/layer.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; } |