Skip to content

Commit

Permalink
Fix nonnull-compare warning in DNA_view3d_types.h
Browse files Browse the repository at this point in the history
Was introduced in rB93a8fd1249f
  • Loading branch information
jessey-git committed Oct 16, 2021
1 parent 5fed3ae commit 4586688
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions source/blender/makesdna/DNA_view3d_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 4586688

Please sign in to comment.