[Bf-blender-cvs] [20cc14e2b75] blender2.8: Cleanup: warning

Campbell Barton noreply at git.blender.org
Thu May 17 15:51:59 CEST 2018


Commit: 20cc14e2b7551bb043472174b8be79d8aaa4df3d
Author: Campbell Barton
Date:   Thu May 17 15:51:24 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB20cc14e2b7551bb043472174b8be79d8aaa4df3d

Cleanup: warning

===================================================================

M	source/blender/makesrna/intern/rna_scene.c

===================================================================

diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index fc4b1a49963..9331049780b 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -5682,6 +5682,7 @@ static void rna_def_scene_display(BlenderRNA *brna)
 	StructRNA *srna;
 	PropertyRNA *prop;
 
+#ifdef WITH_CLAY_ENGINE
 	static const EnumPropertyItem clay_matcap_items[] = {
 	    {1, "01", ICON_MATCAP_01, "", ""},
 	    {2, "02", ICON_MATCAP_02, "", ""},
@@ -5709,8 +5710,9 @@ static void rna_def_scene_display(BlenderRNA *brna)
 	    {24, "24", ICON_MATCAP_24, "", ""},
 	    {0, NULL, 0, NULL, NULL}
 	};
+#endif
 
-	static float default_light_direction[3] = {-0.577350269, -0.577350269, 0.577350269};
+	static float default_light_direction[3] = {-M_SQRT1_3, -M_SQRT1_3, M_SQRT1_3};
 
 	srna = RNA_def_struct(brna, "SceneDisplay", NULL);
 	RNA_def_struct_ui_text(srna, "Scene Display", "Scene display settings for 3d viewport");



More information about the Bf-blender-cvs mailing list