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/blenkernel/intern/smoke.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/blenkernel/intern/smoke.c')
| -rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index b2aaf821df8..98f7dfd4e7e 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -2155,6 +2155,7 @@ static void update_flowsfluids(Scene *scene, Object *ob, SmokeDomainSettings *sd active_fields |= SM_ACTIVE_COLOR_SET; } else if (!equals_v3v3(sds->active_color, sfs->color)) { + copy_v3_v3(sds->active_color, sfs->color); active_fields |= SM_ACTIVE_COLORS; } } @@ -2173,6 +2174,7 @@ static void update_flowsfluids(Scene *scene, Object *ob, SmokeDomainSettings *sd active_fields |= SM_ACTIVE_COLOR_SET; } else if (!equals_v3v3(sds->active_color, sds->flame_smoke_color)) { + copy_v3_v3(sds->active_color, sds->flame_smoke_color); active_fields |= SM_ACTIVE_COLORS; } } |