[Bf-blender-cvs] [7536ff1b38e] new-object-types: Fix various build issues

[Brecht Van Lommel]

Commit: 7536ff1b38e3506e316648bdcc53500da93764c3
Author: Brecht Van Lommel
Date:   Sun Feb 2 22:40:21 2020 +0100
Branches: new-object-types
https://developer.blender.org/rB7536ff1b38e3506e316648bdcc53500da93764c3

Fix various build issues

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

M	intern/cycles/blender/blender_curves.cpp
M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/blenkernel/intern/volume.cc
M	source/blender/makesrna/intern/rna_volume.c

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

diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp
index 57c99cbf032..b1a26c2da43 100644
--- a/intern/cycles/blender/blender_curves.cpp
+++ b/intern/cycles/blender/blender_curves.cpp
@@ -1207,7 +1207,7 @@ static void export_hair_curves(Scene *scene, Mesh *mesh, BL::Hair b_hair)
     const int first_point_index = b_curve.first_point_index();
     const int num_points = b_curve.num_points();
 
-    float3 prev_co;
+    float3 prev_co = make_float3(0.0f, 0.0f, 0.0f);
     float length = 0.0f;
     if (attr_intercept) {
       points_length.clear();
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index f522ad0f702..e29e53391da 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -647,6 +647,18 @@ if(WITH_OPENVDB)
       -DWITH_OPENVDB_BLOSC
     )
   endif()
+
+  if(WIN32)
+    add_definitions(
+      -DOPENVDB_STATICLIB
+    )
+  endif()
+
+  if(WITH_OPENVDB_3_ABI_COMPATIBLE)
+    add_definitions(
+      -DOPENVDB_3_ABI_COMPATIBLE
+    )
+  endif()
 endif()
 
 if(WITH_QUADRIFLOW)
diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc
index 0b4ba44ba83..efb8bfc9d6b 100644
--- a/source/blender/blenkernel/intern/volume.cc
+++ b/source/blender/blenkernel/intern/volume.cc
@@ -553,6 +553,8 @@ VolumeGridType BKE_volume_grid_type(const VolumeGrid *volume_grid)
   else if (grid->isType<openvdb::MaskGrid>()) {
     return VOLUME_GRID_MASK;
   }
+#else
+  UNUSED_VARS(volume_grid);
 #endif
 
   return VOLUME_GRID_UNKNOWN;
@@ -664,6 +666,8 @@ bool BKE_volume_grid_dense_bounds(const VolumeGrid *volume_grid, size_t min[3],
     max[2] = bbox.max().z() + 1;
     return true;
   }
+#else
+  UNUSED_VARS(volume_grid);
 #endif
 
   min[0] = 0;
diff --git a/source/blender/makesrna/intern/rna_volume.c b/source/blender/makesrna/intern/rna_volume.c
index 7c9b558fd73..7b974ac0eed 100644
--- a/source/blender/makesrna/intern/rna_volume.c
+++ b/source/blender/makesrna/intern/rna_volume.c
@@ -210,6 +210,7 @@ static void rna_def_volume_grid(BlenderRNA *brna)
       {VOLUME_GRID_VECTOR_DOUBLE, "VECTOR_DOUBLE", 0, "Double Vector", "3D double vector"},
       {VOLUME_GRID_VECTOR_INT, "VECTOR_INT", 0, "Integer Vector", "3D integer vector"},
       {VOLUME_GRID_UNKNOWN, "UNKNOWN", 0, "Unknown", "Unsupported data type"},
+      {0, NULL, 0, NULL, NULL},
   };
 
   prop = RNA_def_property(srna, "data_type", PROP_ENUM, PROP_NONE);