[Bf-blender-cvs] [1845f0ee8b3] master: Cleanup: Fix build error with MSVC

Lazydodo noreply at git.blender.org
Wed Aug 14 20:52:55 CEST 2019


Commit: 1845f0ee8b33698ddd48c22000004ad4084a77ab
Author: Lazydodo
Date:   Wed Aug 14 12:52:17 2019 -0600
Branches: master
https://developer.blender.org/rB1845f0ee8b33698ddd48c22000004ad4084a77ab

Cleanup: Fix build error with MSVC

C99 style initializers are C++20 feature and should not be used.

Reported by @deadpin on chat.

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

M	source/blender/gpu/GPU_vertex_format.h

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

diff --git a/source/blender/gpu/GPU_vertex_format.h b/source/blender/gpu/GPU_vertex_format.h
index dc60c52122c..fc468436499 100644
--- a/source/blender/gpu/GPU_vertex_format.h
+++ b/source/blender/gpu/GPU_vertex_format.h
@@ -164,9 +164,9 @@ BLI_INLINE int gpu_convert_i16_to_i10(short x)
 BLI_INLINE GPUPackedNormal GPU_normal_convert_i10_v3(const float data[3])
 {
   GPUPackedNormal n = {
-      .x = gpu_convert_normalized_f32_to_i10(data[0]),
-      .y = gpu_convert_normalized_f32_to_i10(data[1]),
-      .z = gpu_convert_normalized_f32_to_i10(data[2]),
+      gpu_convert_normalized_f32_to_i10(data[0]),
+      gpu_convert_normalized_f32_to_i10(data[1]),
+      gpu_convert_normalized_f32_to_i10(data[2]),
   };
   return n;
 }
@@ -174,9 +174,9 @@ BLI_INLINE GPUPackedNormal GPU_normal_convert_i10_v3(const float data[3])
 BLI_INLINE GPUPackedNormal GPU_normal_convert_i10_s3(const short data[3])
 {
   GPUPackedNormal n = {
-      .x = gpu_convert_i16_to_i10(data[0]),
-      .y = gpu_convert_i16_to_i10(data[1]),
-      .z = gpu_convert_i16_to_i10(data[2]),
+      gpu_convert_i16_to_i10(data[0]),
+      gpu_convert_i16_to_i10(data[1]),
+      gpu_convert_i16_to_i10(data[2]),
   };
   return n;
 }



More information about the Bf-blender-cvs mailing list