diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-06-11 18:52:04 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-06-11 18:52:04 +0300 |
| commit | f3e2af333ca40fdd85e7c77601ad5d58030312f8 (patch) | |
| tree | 521e95e0c2cdbb8ead73c422cf772051794bd2a2 /source | |
| parent | c1ec3333f31b548230d35672949f46f04c54a2c4 (diff) | |
| parent | c5d008460600e54594402317dec889fbba36aacb (diff) | |
Merge branch 'openvdb' into gooseberry
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 7b078121eb7..d1bb997aad1 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -3626,7 +3626,7 @@ void smokeModifier_OpenVDB_export(SmokeModifierData *smd, Scene *scene, Object * void smokeModifier_OpenVDB_import(SmokeModifierData *smd, Scene *scene, Object *ob, OpenVDBCache *cache) { - UNUSED_VARS(smd, scene, ob); + UNUSED_VARS(smd, scene, ob, cache); } void smokeModifier_OpenVDB_update_transform(SmokeModifierData *smd, Scene *scene, diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt index dd81af5977c..9ab2dbb632c 100644 --- a/source/blender/editors/space_view3d/CMakeLists.txt +++ b/source/blender/editors/space_view3d/CMakeLists.txt @@ -91,4 +91,8 @@ if(WITH_FREESTYLE) add_definitions(-DWITH_FREESTYLE) endif() +if(WITH_OPENVDB) + add_definitions(-DWITH_OPENVDB) +endif() + blender_add_lib(bf_editor_space_view3d "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 57bff33e080..963b4b38193 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -8535,12 +8535,14 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short BKE_boundbox_init_from_minmax(&bb, p0, p1); draw_box(bb.vec, false); +#ifdef WITH_OPENVDB glLoadMatrixf(rv3d->viewmat); if (sds->density) OpenVDB_draw_primitive(sds->density, true, true, true, true); if (sds->density_high) OpenVDB_draw_primitive(sds->density_high, true, true, true, true); glMultMatrixf(sds->fluidmat); +#endif } /* don't show smoke before simulation starts, this could be made an option in the future */ |