diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-26 07:50:59 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-26 07:52:10 +0300 |
| commit | f968256b42bd816328f0510d5576246a564b15a6 (patch) | |
| tree | 9d647cfd189462190b4fa522b0a54c44da763a97 /source/blender/makesdna/DNA_scene_types.h | |
| parent | a46290aaa87dfcb9674cb108fc58e00ac0155f46 (diff) | |
Fix T58027: Scene.ray_cast crash
Reintroduce BASE_VISIBLE_BGMODE
D3987 by @Soundwave
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 92a1d6309ea..7ab4187de1a 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1836,6 +1836,10 @@ extern const char *RE_engine_id_CYCLES; (((v3d)->localvd == NULL) || ((v3d)->local_view_uuid & (base)->local_view_bits)) && \ (((1 << (base)->object->type) & (v3d)->object_type_exclude_viewport) == 0) && \ (((base)->flag & BASE_VISIBLE) != 0)) +#define BASE_VISIBLE_BGMODE(v3d, base) ( \ + ((v3d == NULL) || ((v3d)->localvd == NULL) || ((v3d)->local_view_uuid & (base)->local_view_bits)) && \ + ((v3d == NULL) || (((1 << (base)->object->type) & (v3d)->object_type_exclude_viewport) == 0)) && \ + (((base)->flag & BASE_VISIBLE) != 0)) #define FIRSTBASE(_view_layer) ((_view_layer)->object_bases.first) #define LASTBASE(_view_layer) ((_view_layer)->object_bases.last) |