[Bf-blender-cvs] [cfd39887d18] blender2.8: Cleanup: fix compiler warnings.

Brecht Van Lommel noreply at git.blender.org
Sat May 5 16:02:27 CEST 2018


Commit: cfd39887d180f74b69762bb9591dd35ff550552b
Author: Brecht Van Lommel
Date:   Sat May 5 09:37:14 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBcfd39887d180f74b69762bb9591dd35ff550552b

Cleanup: fix compiler warnings.

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

M	source/blender/draw/engines/workbench/workbench_materials.c
M	source/blender/draw/intern/draw_manager.c

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

diff --git a/source/blender/draw/engines/workbench/workbench_materials.c b/source/blender/draw/engines/workbench/workbench_materials.c
index bb6bc42e8ce..9126ab801c7 100644
--- a/source/blender/draw/engines/workbench/workbench_materials.c
+++ b/source/blender/draw/engines/workbench/workbench_materials.c
@@ -54,7 +54,7 @@ static struct {
 
 	float light_direction[3]; /* world light direction for shadows */
 	int next_object_id;
-} e_data = {NULL};
+} e_data = {{NULL}};
 
 /* Shaders */
 extern char datatoc_workbench_prepass_vert_glsl[];
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 906ceac728d..6a70a0202b5 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -320,6 +320,8 @@ void DRW_multisamples_resolve(GPUTexture *src_depth, GPUTexture *src_color)
 		case 16: builtin = GPU_SHADER_2D_IMAGE_MULTISAMPLE_16; break;
 		default:
 			BLI_assert(0);
+			builtin = GPU_SHADER_2D_IMAGE_MULTISAMPLE_2;
+			break;
 	}
 
 	GWN_batch_program_set_builtin(geom, builtin);



More information about the Bf-blender-cvs mailing list