[Bf-blender-cvs] [b724ceba4c8] fluid-mantaflow: small openvdb fix

[Sebastián Barschkis]

Commit: b724ceba4c82f35ba64b0d256628e8ff1b40ed38
Author: Sebastián Barschkis
Date:   Sun May 6 00:00:27 2018 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBb724ceba4c82f35ba64b0d256628e8ff1b40ed38

small openvdb fix

happened because of previous merge commit

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

M	intern/openvdb/openvdb_capi.cc
M	source/blender/blenkernel/intern/pointcache.c

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

diff --git a/intern/openvdb/openvdb_capi.cc b/intern/openvdb/openvdb_capi.cc
index 1c51744185f..0daac6bd21d 100644
--- a/intern/openvdb/openvdb_capi.cc
+++ b/intern/openvdb/openvdb_capi.cc
@@ -61,7 +61,7 @@ OpenVDBFloatGrid *OpenVDB_export_grid_fl(
 
 OpenVDBIntGrid *OpenVDB_export_grid_int(
         OpenVDBWriter *writer,
-        const char *name, unsigned char *data,
+        const char *name, int *data,
 		const int res[3], float matrix[4][4], const float clipping,
         OpenVDBFloatGrid *mask)
 {
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index b7b8aae1c72..9ff22162630 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -1127,7 +1127,7 @@ static int ptcache_smoke_openvdb_write(struct OpenVDBWriter *writer, void *smoke
 		}
 
 		OpenVDB_export_grid_vec(writer, "velocity", vx, vy, vz, sds->res, sds->fluidmat, VEC_CONTRAVARIANT_RELATIVE, false, sds->clipping, clip_grid);
-		OpenVDB_export_grid_ch(writer, "obstacles", obstacles, sds->res, sds->fluidmat, sds->clipping, NULL);
+		OpenVDB_export_grid_int(writer, "obstacles", obstacles, sds->res, sds->fluidmat, sds->clipping, NULL);
 	}
 
 	return 1;