Commit: 2a040825cbbbfc1c11a6ccadfc0f86ebc50bff33
Author: Kévin Dietrich
Date: Thu May 28 01:36:32 2015 +0200
Branches: openvdb
https://developer.blender.org/rB2a040825cbbbfc1c11a6ccadfc0f86ebc50bff33
Fix typos in metadata reading.
===================================================================
M intern/openvdb/intern/openvdb_reader.cpp
M source/blender/blenkernel/intern/smoke.c
===================================================================
diff --git a/intern/openvdb/intern/openvdb_reader.cpp
b/intern/openvdb/intern/openvdb_reader.cpp
index 6d9f0d3..d9a4f53 100644
--- a/intern/openvdb/intern/openvdb_reader.cpp
+++ b/intern/openvdb/intern/openvdb_reader.cpp
@@ -59,7 +59,7 @@ void OpenVDBReader::vec3sMeta(const std::string &name, float
value[3])
void OpenVDBReader::vec3IMeta(const std::string &name, int value[3])
{
- openvdb::Vec3I meta_val = m_meta_map->metaValue<openvdb::Vec3I>(name);
+ openvdb::Vec3i meta_val = m_meta_map->metaValue<openvdb::Vec3i>(name);
value[0] = meta_val.x();
value[1] = meta_val.y();
diff --git a/source/blender/blenkernel/intern/smoke.c
b/source/blender/blenkernel/intern/smoke.c
index 942f90e..20f8322 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -3144,8 +3144,8 @@ static void OpenVDB_export_smoke(SmokeDomainSettings
*sds, struct OpenVDBWriter
smoke_export(sds->fluid, &dt, &dx, &dens, &react, &flame,
&fuel, &heat,
&heatold, &vx, &vy, &vz, &r, &g, &b, &obstacles);
- OpenVDBWriter_add_meta_int(writer, "dx", dx);
- OpenVDBWriter_add_meta_int(writer, "dt", dt);
+ OpenVDBWriter_add_meta_fl(writer, "dx", dx);
+ OpenVDBWriter_add_meta_fl(writer, "dt", dt);
OpenVDB_export_grid_fl(writer, "Shadow", sds->shadow, sds->res,
sds->fluidmat);
OpenVDB_export_grid_fl(writer, "Density", dens, sds->res,
sds->fluidmat);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
