[Bf-blender-cvs] [11d12d543d1] geometry-nodes: Fix build error on windows: Don't use designated initializers in C++

[Hans Goudey]

Commit: 11d12d543d15993810861db70c83bf6b9e58eb02
Author: Hans Goudey
Date:   Mon Nov 2 08:15:49 2020 -0600
Branches: geometry-nodes
https://developer.blender.org/rB11d12d543d15993810861db70c83bf6b9e58eb02

Fix build error on windows: Don't use designated initializers in C++

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

M	source/blender/modifiers/intern/MOD_nodes.cc
M	source/blender/nodes/geometry/nodes/node_geo_boolean.cc

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

diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc
index 03c986fc6e4..093947a42f5 100644
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@ -399,22 +399,26 @@ static const SocketPropertyType *get_socket_property_type(const bNodeSocket &bso
       static const SocketPropertyType float_type = {
           [](const bNodeSocket &socket, const char *name) {
             bNodeSocketValueFloat *value = (bNodeSocketValueFloat *)socket.default_value;
-            IDPropertyTemplate idprop = {.f = value->value};
+            IDPropertyTemplate idprop = {0};
+            idprop.f = value->value;
             return IDP_New(IDP_FLOAT, &idprop, name);
           },
           [](const bNodeSocket &socket, const char *name) {
             bNodeSocketValueFloat *value = (bNodeSocketValueFloat *)socket.default_value;
-            IDPropertyTemplate idprop = {.d = value->min};
+            IDPropertyTemplate idprop = {0};
+            idprop.d = value->min;
             return IDP_New(IDP_DOUBLE, &idprop, name);
           },
           [](const bNodeSocket &socket, const char *name) {
             bNodeSocketValueFloat *value = (bNodeSocketValueFloat *)socket.default_value;
-            IDPropertyTemplate idprop = {.d = value->max};
+            IDPropertyTemplate idprop = {0};
+            idprop.d = value->max;
             return IDP_New(IDP_DOUBLE, &idprop, name);
           },
           [](const bNodeSocket &socket, const char *name) {
             bNodeSocketValueFloat *value = (bNodeSocketValueFloat *)socket.default_value;
-            IDPropertyTemplate idprop = {.d = value->value};
+            IDPropertyTemplate idprop = {0};
+            idprop.d = value->value;
             return IDP_New(IDP_DOUBLE, &idprop, name);
           },
           [](const bNodeSocket &socket) {
@@ -431,22 +435,26 @@ static const SocketPropertyType *get_socket_property_type(const bNodeSocket &bso
       static const SocketPropertyType int_type = {
           [](const bNodeSocket &socket, const char *name) {
             bNodeSocketValueInt *value = (bNodeSocketValueInt *)socket.default_value;
-            IDPropertyTemplate idprop = {.i = value->value};
+            IDPropertyTemplate idprop = {0};
+            idprop.i = value->value;
             return IDP_New(IDP_INT, &idprop, name);
           },
           [](const bNodeSocket &socket, const char *name) {
             bNodeSocketValueInt *value = (bNodeSocketValueInt *)socket.default_value;
-            IDPropertyTemplate idprop = {.i = value->min};
+            IDPropertyTemplate idprop = {0};
+            idprop.i = value->min;
             return IDP_New(IDP_INT, &idprop, name);
           },
           [](const bNodeSocket &socket, const char *name) {
             bNodeSocketValueInt *value = (bNodeSocketValueInt *)socket.default_value;
-            IDPropertyTemplate idprop = {.i = value->max};
+            IDPropertyTemplate idprop = {0};
+            idprop.i = value->max;
             return IDP_New(IDP_INT, &idprop, name);
           },
           [](const bNodeSocket &socket, const char *name) {
             bNodeSocketValueInt *value = (bNodeSocketValueInt *)socket.default_value;
-            IDPropertyTemplate idprop = {.i = value->value};
+            IDPropertyTemplate idprop = {0};
+            idprop.i = value->value;
             return IDP_New(IDP_INT, &idprop, name);
           },
           [](const bNodeSocket &socket) {
@@ -470,12 +478,14 @@ static const SocketPropertyType *get_socket_property_type(const bNodeSocket &bso
           },
           [](const bNodeSocket &socket, const char *name) {
             bNodeSocketValueVector *value = (bNodeSocketValueVector *)socket.default_value;
-            IDPropertyTemplate idprop = {.d = value->min};
+            IDPropertyTemplate idprop = {0};
+            idprop.d = value->min;
             return IDP_New(IDP_DOUBLE, &idprop, name);
           },
           [](const bNodeSocket &socket, const char *name) {
             bNodeSocketValueVector *value = (bNodeSocketValueVector *)socket.default_value;
-            IDPropertyTemplate idprop = {.d = value->max};
+            IDPropertyTemplate idprop = {0};
+            idprop.d = value->max;
             return IDP_New(IDP_DOUBLE, &idprop, name);
           },
           [](const bNodeSocket &socket, const char *name) {
@@ -504,20 +514,24 @@ static const SocketPropertyType *get_socket_property_type(const bNodeSocket &bso
       static const SocketPropertyType boolean_type = {
           [](const bNodeSocket &socket, const char *name) {
             bNodeSocketValueBoolean *value = (bNodeSocketValueBoolean *)socket.default_value;
-            IDPropertyTemplate idprop = {.i = value->value != 0};
+            IDPropertyTemplate idprop = {0};
+            idprop.i = value->value != 0;
             return IDP_New(IDP_INT, &idprop, name);
           },
           [](const bNodeSocket &UNUSED(socket), const char *name) {
-            IDPropertyTemplate idprop = {.i = 0};
+            IDPropertyTemplate idprop = {0};
+            idprop.i = 0;
             return IDP_New(IDP_INT, &idprop, name);
           },
           [](const bNodeSocket &UNUSED(socket), const char *name) {
-            IDPropertyTemplate value = {.i = 1};
-            return IDP_New(IDP_INT, &value, name);
+            IDPropertyTemplate idprop = {0};
+            idprop.i = 1;
+            return IDP_New(IDP_INT, &idprop, name);
           },
           [](const bNodeSocket &socket, const char *name) {
             bNodeSocketValueBoolean *value = (bNodeSocketValueBoolean *)socket.default_value;
-            IDPropertyTemplate idprop = {.i = value->value != 0};
+            IDPropertyTemplate idprop = {0};
+            idprop.i = value->value != 0;
             return IDP_New(IDP_INT, &idprop, name);
           },
           nullptr,
diff --git a/source/blender/nodes/geometry/nodes/node_geo_boolean.cc b/source/blender/nodes/geometry/nodes/node_geo_boolean.cc
index 076cba6fa80..87103d3d6fd 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_boolean.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_boolean.cc
@@ -53,12 +53,14 @@ static Mesh *mesh_boolean_calc(const Mesh *mesh_a, const Mesh *mesh_b, int boole
 
   BMesh *bm;
   {
-    struct BMeshCreateParams bmesh_create_params = {.use_toolflags = false};
+    struct BMeshCreateParams bmesh_create_params = {0};
+    bmesh_create_params.use_toolflags = false;
     bm = BM_mesh_create(&allocsize, &bmesh_create_params);
   }
 
   {
-    struct BMeshFromMeshParams bmesh_from_mesh_params = {.calc_face_normal = true};
+    struct BMeshFromMeshParams bmesh_from_mesh_params = {0};
+    bmesh_from_mesh_params.calc_face_normal = true;
     BM_mesh_bm_from_me(bm, mesh_a, &bmesh_from_mesh_params);
     BM_mesh_bm_from_me(bm, mesh_b, &bmesh_from_mesh_params);
   }