diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-07-13 22:40:21 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-07-13 22:40:21 +0400 |
commit | 1fd33b6e777d54a3702e58253dabf94a752783e2 (patch) | |
tree | efe02ce8e079d6bf5448cf7c6d3fed7b9e39a86e /source/blender/gpu | |
parent | f94c9d5d612879aa5b7fec8be224b25aac870b5c (diff) |
cmake option to build without smoke sim: WITH_MOD_SMOKE
Diffstat (limited to 'source/blender/gpu')
-rw-r--r-- | source/blender/gpu/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/gpu/SConscript | 2 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 6 |
3 files changed, 12 insertions, 0 deletions
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index ce3150476f9..76e347270ba 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -56,6 +56,10 @@ set(SRC intern/gpu_codegen.h ) +if(WITH_MOD_SMOKE) + add_definitions(-DWITH_SMOKE) +endif() + add_definitions(-DGLEW_STATIC) blender_add_lib(bf_gpu "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/gpu/SConscript b/source/blender/gpu/SConscript index 515c7166c2a..b48e1d5a8e2 100644 --- a/source/blender/gpu/SConscript +++ b/source/blender/gpu/SConscript @@ -13,4 +13,6 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_OPENGL_INC'] +defs.append('WITH_SMOKE') # TODO, make optional + env.BlenderLib ( 'bf_gpu', sources, Split(incs), defines = defs, libtype=['core','player'], priority=[160,110] ) diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 87d25ac850a..9878d83ff5a 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -822,12 +822,18 @@ void GPU_free_smoke(SmokeModifierData *smd) void GPU_create_smoke(SmokeModifierData *smd, int highres) { +#ifdef WITH_SMOKE if(smd->type & MOD_SMOKE_TYPE_DOMAIN && !smd->domain->tex && !highres) smd->domain->tex = GPU_texture_create_3D(smd->domain->res[0], smd->domain->res[1], smd->domain->res[2], smoke_get_density(smd->domain->fluid)); else if(smd->type & MOD_SMOKE_TYPE_DOMAIN && !smd->domain->tex && highres) smd->domain->tex = GPU_texture_create_3D(smd->domain->res_wt[0], smd->domain->res_wt[1], smd->domain->res_wt[2], smoke_turbulence_get_density(smd->domain->wt)); smd->domain->tex_shadow = GPU_texture_create_3D(smd->domain->res[0], smd->domain->res[1], smd->domain->res[2], smd->domain->shadow); +#else // WITH_SMOKE + (void)highres; + smd->domain->tex= NULL; + smd->domain->tex_shadow= NULL; +#endif // WITH_SMOKE } static ListBase image_free_queue = {NULL, NULL}; |