[Bf-blender-cvs] [81f68bbba19] master: Fix compilation errors and warnings with Clang-6

Sergey Sharybin noreply at git.blender.org
Fri Sep 28 09:46:40 CEST 2018


Commit: 81f68bbba1951595f0569af18d052a9b45681434
Author: Sergey Sharybin
Date:   Fri Sep 28 09:46:12 2018 +0200
Branches: master
https://developer.blender.org/rB81f68bbba1951595f0569af18d052a9b45681434

Fix compilation errors and warnings with Clang-6

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

M	intern/cycles/render/camera.cpp
M	source/blender/editors/space_logic/logic_window.c
M	source/blender/windowmanager/intern/wm_files.c

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

diff --git a/intern/cycles/render/camera.cpp b/intern/cycles/render/camera.cpp
index ec3c56e820a..34066e1b024 100644
--- a/intern/cycles/render/camera.cpp
+++ b/intern/cycles/render/camera.cpp
@@ -716,7 +716,7 @@ float Camera::world_to_raster_size(float3 P)
 		float3 D = transform_point(&worldtocamera, P);
 		float dist = len(D);
 
-		Ray ray = {0};
+		Ray ray = {{0}};
 
 		/* Distortion can become so great that the results become meaningless, there
 		 * may be a better way to do this, but calculating differentials from the
diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c
index c8385dfcbe3..a88d82fa05a 100644
--- a/source/blender/editors/space_logic/logic_window.c
+++ b/source/blender/editors/space_logic/logic_window.c
@@ -964,7 +964,7 @@ static void draw_sensor_collision(uiLayout *layout, PointerRNA *ptr, bContext *C
 	uiItemR(row, ptr, "use_pulse", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
 	uiItemR(row, ptr, "use_material", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
 
-	switch (RNA_boolean_get(ptr, "use_material")) {
+	switch (RNA_enum_get(ptr, "use_material")) {
 		case SENS_COLLISION_PROPERTY:
 			uiItemR(split, ptr, "property", 0, NULL, ICON_NONE);
 			break;
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 38e2d6d21ee..796103677bf 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -641,7 +641,7 @@ bool WM_file_read(bContext *C, const char *filepath, ReportList *reports)
 struct {
 	char app_template[64];
 	bool override;
-} wm_init_state_app_template = {0};
+} wm_init_state_app_template = {{0}};
 
 /**
  * Used for setting app-template from the command line:



More information about the Bf-blender-cvs mailing list