[Bf-blender-cvs] [2beb654] openvdb: Fix compile issue when WITH_OPENVDB

[Kévin Dietrich]

Commit: 2beb654d69b6f67a1e77bbc31881875af8f90750
Author: Kévin Dietrich
Date:   Fri May 29 05:02:39 2015 +0200
Branches: openvdb
https://developer.blender.org/rB2beb654d69b6f67a1e77bbc31881875af8f90750

Fix compile issue when WITH_OPENVDB

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

M       source/blender/blenkernel/intern/smoke.c
M       source/blender/editors/object/object_modifier.c

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

diff --git a/source/blender/blenkernel/intern/smoke.c 
b/source/blender/blenkernel/intern/smoke.c
index 9d75eeaa..c660973 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -400,7 +400,9 @@ static void smokeModifier_freeDomain(SmokeModifierData *smd)
                smd->domain->point_cache[0] = NULL;
 
                while ((cache = BLI_pophead(&(smd->domain->vdb_caches)))) {
+#ifdef WITH_OPENVDB
                        OpenVDBWriter_free(cache->writer);
+#endif
                        MEM_freeN(cache);
                }
 
@@ -3422,10 +3424,14 @@ void 
smokeModifier_OpenVDB_update_transform(SmokeModifierData *smd,
        scene->r.cfra = orig_frame;
 }
 
-#else
+#endif /* WITH_OPENVDB */
 
-void smokeModifier_OpenVDB_export(SmokeModifierData *smd, Scene *scene, Object 
*ob, DerivedMesh *dm,
-                                  update_cb update, void *update_cb_data)
+#endif /* WITH_SMOKE */
+
+#if !defined(WITH_SMOKE) || !defined(WITH_OPENVDB)
+
+void smokeModifier_OpenVDB_export(SmokeModifierData *smd, Scene *scene, Object 
*ob,
+                                  DerivedMesh *dm, update_cb update, void 
*update_cb_data)
 {
        UNUSED_VARS(smd, scene, ob, dm, update, update_cb_data);
 }
@@ -3435,15 +3441,10 @@ void smokeModifier_OpenVDB_import(SmokeModifierData 
*smd, Scene *scene, Object *
        UNUSED_VARS(smd, scene, ob);
 }
 
-void smokeModifier_OpenVDB_update_transform(SmokeModifierData *smd,
-                                            Scene *scene,
-                                            Object *ob,
-                                            update_cb update,
-                                            void *update_cb_data)
+void smokeModifier_OpenVDB_update_transform(SmokeModifierData *smd, Scene 
*scene,
+                                            Object *ob, update_cb update, void 
*update_cb_data)
 {
        UNUSED_VARS(smd, scene, ob, update, update_cb_data);
 }
 
-#endif /* WITH_OPENVDB */
-
-#endif /* WITH_SMOKE */
+#endif
diff --git a/source/blender/editors/object/object_modifier.c 
b/source/blender/editors/object/object_modifier.c
index d36f87b..07194fe 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -2496,7 +2496,7 @@ static OpenVDBCache *openvdb_cache_new(void)
 
        cache = MEM_callocN(sizeof(OpenVDBCache), "OpenVDBCache");
        cache->reader = NULL;
-       cache->writer = OpenVDBWriter_create();
+       cache->writer = NULL;
        cache->startframe = 1;
        cache->endframe = 250;
        cache->compression = VDB_COMPRESSION_ZIP;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs