[Bf-blender-cvs] [24e3db2] openvdb: Fix for bad level function implementation.

Lukas Tönne noreply at git.blender.org
Thu Jun 11 12:41:52 CEST 2015


Commit: 24e3db23026319517294b06cc6e35f675195e9c0
Author: Lukas Tönne
Date:   Thu Jun 11 12:40:40 2015 +0200
Branches: openvdb
https://developer.blender.org/rB24e3db23026319517294b06cc6e35f675195e9c0

Fix for bad level function implementation.

Was declared in BKE, but implemented in editors, giving undefined
references in the player.

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

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 66f055d..5e2c72b 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -3502,3 +3502,16 @@ void BKE_openvdb_cache_filename(char *r_filename, const char *path, const char *
 }
 
 #endif
+
+OpenVDBCache *BKE_openvdb_get_current_cache(SmokeDomainSettings *sds)
+{
+	OpenVDBCache *cache = sds->vdb_caches.first;
+
+	for (; cache; cache = cache->next) {
+		if (cache->flags & VDB_CACHE_CURRENT) {
+			break;
+		}
+	}
+
+	return cache;
+}
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 40ad065..e72c8d2 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -2542,19 +2542,6 @@ void OBJECT_OT_smoke_vdb_transform_update(wmOperatorType *ot)
 
 /* ************************* OpenVDB cache operators ************************* */
 
-OpenVDBCache *BKE_openvdb_get_current_cache(SmokeDomainSettings *sds)
-{
-	OpenVDBCache *cache = sds->vdb_caches.first;
-
-	for (; cache; cache = cache->next) {
-		if (cache->flags & VDB_CACHE_CURRENT) {
-			break;
-		}
-	}
-
-	return cache;
-}
-
 static OpenVDBCache *openvdb_cache_new(void)
 {
 	OpenVDBCache *cache = NULL;




More information about the Bf-blender-cvs mailing list