blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Fix nonnull-compare warning in DNA_view3d_types.h 

Was introduced in rB93a8fd1249f
This commit is contained in:
Jesse Yurkovich 2021-10-15 19:17:06 -07:00
parent 5fed3aec4a
commit 4586688323
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/makesdna/DNA_view3d_types.h
View File

@ -501,16 +501,14 @@ enum {
};
#define V3D_USES_SCENE_LIGHTS(v3d) \
((v3d) && \
((((v3d)->shading.type == OB_MATERIAL) && ((v3d)->shading.flag & V3D_SHADING_SCENE_LIGHTS)) || \
(((v3d)->shading.type == OB_RENDER) && \
((v3d)->shading.flag & V3D_SHADING_SCENE_LIGHTS_RENDER))))
((((v3d)->shading.type == OB_MATERIAL) && ((v3d)->shading.flag & V3D_SHADING_SCENE_LIGHTS)) || \
(((v3d)->shading.type == OB_RENDER) && \
((v3d)->shading.flag & V3D_SHADING_SCENE_LIGHTS_RENDER)))
#define V3D_USES_SCENE_WORLD(v3d) \
((v3d) && \
((((v3d)->shading.type == OB_MATERIAL) && ((v3d)->shading.flag & V3D_SHADING_SCENE_WORLD)) || \
(((v3d)->shading.type == OB_RENDER) && \
((v3d)->shading.flag & V3D_SHADING_SCENE_WORLD_RENDER))))
((((v3d)->shading.type == OB_MATERIAL) && ((v3d)->shading.flag & V3D_SHADING_SCENE_WORLD)) || \
(((v3d)->shading.type == OB_RENDER) && \
((v3d)->shading.flag & V3D_SHADING_SCENE_WORLD_RENDER)))
/** #View3DShading.cavity_type */
enum {