[Bf-blender-cvs] [fbc9542] openvdb: Small cleanup.

Kévin Dietrich noreply at git.blender.org
Fri Jun 5 14:08:59 CEST 2015


Commit: fbc95426b9994450742cf989b343d3068770c3c5
Author: Kévin Dietrich
Date:   Fri Jun 5 13:52:24 2015 +0200
Branches: openvdb
https://developer.blender.org/rBfbc95426b9994450742cf989b343d3068770c3c5

Small cleanup.

- Remove unnecessary forward declarations
- Use MEM_callocN to initialize memory for new caches, would assert due
to OpenVDBCache.filename not being initialized.

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

M	intern/openvdb/openvdb_capi.h
M	source/blender/editors/object/object_modifier.c

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

diff --git a/intern/openvdb/openvdb_capi.h b/intern/openvdb/openvdb_capi.h
index ef5ed98..63ec534 100644
--- a/intern/openvdb/openvdb_capi.h
+++ b/intern/openvdb/openvdb_capi.h
@@ -30,8 +30,6 @@
 extern "C" {
 #endif
 
-struct bNode;
-struct bNodeTree;
 struct OpenVDBReader;
 struct OpenVDBWriter;
 struct OpenVDBFloatGrid;
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 3dfd5f4..867a8f1 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -2503,7 +2503,7 @@ static OpenVDBCache *openvdb_cache_new(void)
 {
 	OpenVDBCache *cache = NULL;
 
-	cache = MEM_mallocN(sizeof(OpenVDBCache), "OpenVDBCache");
+	cache = MEM_callocN(sizeof(OpenVDBCache), "OpenVDBCache");
 	cache->reader = NULL;
 	cache->writer = NULL;
 	cache->startframe = 1;




More information about the Bf-blender-cvs mailing list