diff options
| author | Jesse Yurkovich <jesse.y@gmail.com> | 2021-10-16 05:17:06 +0300 |
|---|---|---|
| committer | Jesse Yurkovich <jesse.y@gmail.com> | 2021-10-16 05:17:06 +0300 |
| commit | 458668832370d3aa98b0f75c4587534e75d60fe4 (patch) | |
| tree | a1e503cc9f93fc73d892b22637b64c8ecc09a8f5 /source/blender/makesdna | |
| parent | 5fed3aec4a077b1d14266fc3068241ee8fdd1d7d (diff) | |
Fix nonnull-compare warning in DNA_view3d_types.h
Was introduced in rB93a8fd1249f
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index d5db72ea85a..9b5ed133feb 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -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 { |