[Bf-blender-cvs] [3ee0723b7db] blender2.8: fix warnings from previous commit

Mike Erwin noreply at git.blender.org
Tue Mar 14 06:41:34 CET 2017


Commit: 3ee0723b7db79f782c5a6efad13d7eb43c2b017c
Author: Mike Erwin
Date:   Tue Mar 14 01:41:09 2017 -0400
Branches: blender2.8
https://developer.blender.org/rB3ee0723b7db79f782c5a6efad13d7eb43c2b017c

fix warnings from previous commit

Batch struct initializer needed more {{braces}}

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

M	source/blender/editors/space_view3d/drawarmature.c
M	source/blender/gpu/intern/gpu_framebuffer.c

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

diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c
index 18a558cf483..3cb83546a44 100644
--- a/source/blender/editors/space_view3d/drawarmature.c
+++ b/source/blender/editors/space_view3d/drawarmature.c
@@ -365,7 +365,7 @@ static void drawsolidcube_size(float xsize, float ysize, float zsize)
 {
 	static VertexFormat format = {0};
 	static VertexBuffer vbo = {{0}};
-	static Batch batch = {0};
+	static Batch batch = {{0}};
 	const float light_vec[3] = {0.0f, 0.0f, 1.0f};
 
 	if (format.attrib_ct == 0) {
@@ -428,7 +428,7 @@ static void drawcube_size(float xsize, float ysize, float zsize)
 	static VertexBuffer vbo = {{0}};
 	static ElementListBuilder elb = {0};
 	static ElementList el = {0};
-	static Batch batch = {0};
+	static Batch batch = {{0}};
 
 	if (format.attrib_ct == 0) {
 		/* Vertex format */
@@ -467,7 +467,7 @@ static void draw_bonevert(void)
 {
 	static VertexFormat format = {0};
 	static VertexBuffer vbo = {{0}};
-	static Batch batch = {0};
+	static Batch batch = {{0}};
 
 	if (format.attrib_ct == 0) {
 		/* Vertex format */
@@ -585,7 +585,7 @@ static void draw_bone_octahedral(void)
 	static VertexBuffer vbo = {{0}};
 	static ElementListBuilder elb = {0};
 	static ElementList el = {0};
-	static Batch batch = {0};
+	static Batch batch = {{0}};
 
 	if (format.attrib_ct == 0) {
 		/* Vertex format */
@@ -622,7 +622,7 @@ static void draw_bone_solid_octahedral(void)
 {
 	static VertexFormat format = {0};
 	static VertexBuffer vbo = {{0}};
-	static Batch batch = {0};
+	static Batch batch = {{0}};
 	const float light_vec[3] = {0.0f, 0.0f, 1.0f};
 
 	if (format.attrib_ct == 0) {
diff --git a/source/blender/gpu/intern/gpu_framebuffer.c b/source/blender/gpu/intern/gpu_framebuffer.c
index d632e1b44e6..bd08f9d9195 100644
--- a/source/blender/gpu/intern/gpu_framebuffer.c
+++ b/source/blender/gpu/intern/gpu_framebuffer.c
@@ -386,7 +386,7 @@ void GPU_framebuffer_blur(
 
 	static VertexFormat format = {0};
 	static VertexBuffer vbo = {{0}};
-	static Batch batch = {0};
+	static Batch batch = {{0}};
 
 	const float scaleh[2] = {1.0f / GPU_texture_width(blurtex), 0.0f};
 	const float scalev[2] = {0.0f, 1.0f / GPU_texture_height(tex)};




More information about the Bf-blender-cvs mailing list