Commit: 458668832370d3aa98b0f75c4587534e75d60fe4
Author: Jesse Yurkovich
Date: Fri Oct 15 19:17:06 2021 -0700
Branches: master
https://developer.blender.org/rB458668832370d3aa98b0f75c4587534e75d60fe4
Fix nonnull-compare warning in DNA_view3d_types.h
Was introduced in rB93a8fd1249f
===================================================================
M source/blender/makesdna/DNA_view3d_types.h
===================================================================
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 {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
