diff options
author | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2016-09-25 18:02:46 +0300 |
---|---|---|
committer | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2016-09-25 18:02:46 +0300 |
commit | ae69986b70611f358491759f39fd91efd015dab9 (patch) | |
tree | 43c6dd858dc50a0c673e76993cc5447640263a72 /source/blender | |
parent | 335ee5ce5aee3a92415d1608cc66acf3da995598 (diff) |
Viewport smoke: fix a couple of issues in the new display settings.
- WITH_SMOKE macro was not defined so some code was not compiled, though
it was still accessible from the UI
- some UI elements were disappearing due to bad indentation, also rework
the UI code to not hide but rather disable/grey out button in the UI
- Display thickness was not used due to bad manual merge of the code
from the patch.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/space_view3d/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/drawvolume.c | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt index 059b384a9e2..a5c60248bf1 100644 --- a/source/blender/editors/space_view3d/CMakeLists.txt +++ b/source/blender/editors/space_view3d/CMakeLists.txt @@ -90,6 +90,10 @@ if(WITH_FREESTYLE) add_definitions(-DWITH_FREESTYLE) endif() +if(WITH_MOD_SMOKE) + add_definitions(-DWITH_SMOKE) +endif() + if(WITH_LEGACY_DEPSGRAPH) add_definitions(-DWITH_LEGACY_DEPSGRAPH) endif() diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c index 79d51093734..d743ff9239a 100644 --- a/source/blender/editors/space_view3d/drawvolume.c +++ b/source/blender/editors/space_view3d/drawvolume.c @@ -382,7 +382,7 @@ static void bind_shader(SmokeDomainSettings *sds, GPUShader *shader, GPUTexture GPU_shader_uniform_texture(shader, spec_location, tex_spec); } else { - float density_scale = 10.0f; + float density_scale = 10.0f * sds->display_thickness; GPU_shader_uniform_vector(shader, stepsize_location, 1, 1, &sds->dx); GPU_shader_uniform_vector(shader, densityscale_location, 1, 1, &density_scale); @@ -572,6 +572,7 @@ void draw_smoke_volume(SmokeDomainSettings *sds, Object *ob, } } +#ifdef WITH_SMOKE static void add_tri(float (*verts)[3], float(*colors)[3], int *offset, float p1[3], float p2[3], float p3[3], float rgb[3]) { @@ -645,6 +646,7 @@ static void add_streamline(float (*verts)[3], float(*colors)[3], float center[3] } typedef void (*vector_draw_func)(float(*)[3], float(*)[3], float*, float*, float, float, int*); +#endif /* WITH_SMOKE */ void draw_smoke_velocity(SmokeDomainSettings *domain, float viewnormal[3]) { @@ -652,11 +654,6 @@ void draw_smoke_velocity(SmokeDomainSettings *domain, float viewnormal[3]) const float *vel_x = smoke_get_velocity_x(domain->fluid); const float *vel_y = smoke_get_velocity_y(domain->fluid); const float *vel_z = smoke_get_velocity_z(domain->fluid); -#else - const float *vel_x = NULL; - const float *vel_y = NULL; - const float *vel_z = NULL; -#endif if (ELEM(NULL, vel_x, vel_y, vel_z)) { return; @@ -755,6 +752,9 @@ void draw_smoke_velocity(SmokeDomainSettings *domain, float viewnormal[3]) MEM_freeN(verts); MEM_freeN(colors); +#else + UNUSED_VARS(domain, viewnormal); +#endif } #ifdef SMOKE_DEBUG_HEAT |