Commit: e6517c1fd74d69932a3af175649db94f5bba29c2
Author: Kévin Dietrich
Date: Wed Jun 3 20:34:28 2015 +0200
Branches: openvdb
https://developer.blender.org/rBe6517c1fd74d69932a3af175649db94f5bba29c2
Various cleanup.
===================================================================
M intern/cycles/kernel/kernel_globals.h
M intern/cycles/render/nodes.cpp
M source/blender/blenloader/intern/readfile.c
M source/blender/editors/object/CMakeLists.txt
M source/blender/editors/object/object_modifier.c
===================================================================
diff --git a/intern/cycles/kernel/kernel_globals.h
b/intern/cycles/kernel/kernel_globals.h
index 2ec08c4..157720d 100644
--- a/intern/cycles/kernel/kernel_globals.h
+++ b/intern/cycles/kernel/kernel_globals.h
@@ -31,9 +31,9 @@ struct OSLThreadData;
struct OSLShadingSystem;
#endif
-#define MAX_BYTE_IMAGES 1024
-#define MAX_FLOAT_IMAGES 1024
-#define MAX_VOLUME 1024
+#define MAX_BYTE_IMAGES 1024
+#define MAX_FLOAT_IMAGES 1024
+#define MAX_VOLUME 1024
typedef struct KernelGlobals {
texture_image_uchar4 texture_byte_images[MAX_BYTE_IMAGES];
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 6c90f16..be56045 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -4406,8 +4406,8 @@ void OpenVDBNode::compile(SVMCompiler& compiler)
}
grid_slot = volume_manager->add_volume(filename.string(),
- output_names[i].string(),
- sampling, type);
+ output_names[i].string(),
+ sampling, type);
if(grid_slot == -1) {
continue;
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index b7a574f..3bdd1a5 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4769,7 +4769,6 @@ static void direct_link_modifiers(FileData *fd, ListBase
*lb)
SmokeModifierData *smd = (SmokeModifierData *)md;
if (smd->type == MOD_SMOKE_TYPE_DOMAIN) {
- OpenVDBCache *cache;
smd->flow = NULL;
smd->coll = NULL;
smd->domain = newdataadr(fd, smd->domain);
@@ -4805,10 +4804,14 @@ static void direct_link_modifiers(FileData *fd,
ListBase *lb)
smd->domain->point_cache[1] = NULL;
}
- link_list(fd, &smd->domain->vdb_caches);
- for (cache = smd->domain->vdb_caches.first;
cache; cache = cache->next) {
- cache->reader = NULL;
- cache->writer = NULL;
+ {
+ OpenVDBCache *cache;
+
+ link_list(fd, &smd->domain->vdb_caches);
+ for (cache =
smd->domain->vdb_caches.first; cache; cache = cache->next) {
+ cache->reader = NULL;
+ cache->writer = NULL;
+ }
}
}
else if (smd->type == MOD_SMOKE_TYPE_FLOW) {
diff --git a/source/blender/editors/object/CMakeLists.txt
b/source/blender/editors/object/CMakeLists.txt
index 1864bdf..5f24430 100644
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -34,7 +34,6 @@ set(INC
../../windowmanager
../../../../intern/guardedalloc
../../../../intern/glew-mx
- ../../../../intern/smoke/extern
../../../../intern/openvdb
)
diff --git a/source/blender/editors/object/object_modifier.c
b/source/blender/editors/object/object_modifier.c
index 8486de6..e57ff1b 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -2308,7 +2308,6 @@ typedef struct SmokeExportJob {
void *owner;
short *stop, *do_update;
float *progress;
- int current_frame;
struct SmokeModifierData *smd;
struct Scene *scene;
struct Object *ob;
@@ -2504,7 +2503,7 @@ static OpenVDBCache *openvdb_cache_new(void)
{
OpenVDBCache *cache = NULL;
- cache = MEM_callocN(sizeof(OpenVDBCache), "OpenVDBCache");
+ cache = MEM_mallocN(sizeof(OpenVDBCache), "OpenVDBCache");
cache->reader = NULL;
cache->writer = NULL;
cache->startframe = 1;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
