diff options
| author | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2016-01-10 13:37:34 +0300 |
|---|---|---|
| committer | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2016-01-10 13:37:34 +0300 |
| commit | f1e8204f5afc88903edff5719d0bb159a5f483ba (patch) | |
| tree | e9eb3bee0274748f26f8c751778b94db435d5304 /source/blender/editors/space_view3d/drawvolume.c | |
| parent | e9c8e0316fbce2edfc9c2b6d0ddce18a3ea2a22a (diff) | |
Smoke: fix for missing viewport color update.
Active color wasn't copied over if it differs from what the user plugged
in in the UI. Also use a darker color for the default color so smoke
doesn't doen't appear too bright.
Reported in IRC by mib2berlin.
Diffstat (limited to 'source/blender/editors/space_view3d/drawvolume.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawvolume.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c index 591cf94b86f..801419b81c0 100644 --- a/source/blender/editors/space_view3d/drawvolume.c +++ b/source/blender/editors/space_view3d/drawvolume.c @@ -351,8 +351,8 @@ void draw_smoke_volume(SmokeDomainSettings *sds, Object *ob, GPU_shader_uniform_texture(shader, spec_location, tex_spec); } - float active_color[4] = { 1.0, 1.0, 1.0, 10.0 }; - if ((sds->active_fields & SM_ACTIVE_COLORS) == 0) + float active_color[4] = { 0.7, 0.7, 0.7, 10.0 }; + if ((sds->active_fields & SM_ACTIVE_COLORS) != 0) copy_v3_v3(active_color, sds->active_color); GPU_shader_uniform_vector(shader, actcol_location, 4, 1, active_color); |