diff options
| author | Jacques Lucke <mail@jlucke.com> | 2019-12-17 11:34:13 +0300 |
|---|---|---|
| committer | Jacques Lucke <mail@jlucke.com> | 2019-12-17 11:34:13 +0300 |
| commit | 9a3b3700615e21fd84ec4204962f010e14b2fc43 (patch) | |
| tree | 1b073a2a0cd8de2829cf22561b964fd9791acaed /source/blender/editors/space_outliner/outliner_draw.c | |
| parent | 2b84a7d5b07ff7883997f520b16b467da74515c4 (diff) | |
| parent | 7d2d2ffa76647871836f779f013c99e474228f3d (diff) | |
Merge branch 'master' into functions
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_draw.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 9a6f685f5fc..17088b0e2b4 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -2125,14 +2125,14 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te) case eModifierType_Surface: data.icon = ICON_MOD_PHYSICS; break; - case eModifierType_Fluidsim: + case eModifierType_Fluidsim: /* deprecated, old fluid modifier */ data.icon = ICON_MOD_FLUIDSIM; break; case eModifierType_Multires: data.icon = ICON_MOD_MULTIRES; break; - case eModifierType_Smoke: - data.icon = ICON_MOD_SMOKE; + case eModifierType_Fluid: + data.icon = ICON_MOD_FLUID; break; case eModifierType_Solidify: data.icon = ICON_MOD_SOLIDIFY; |