diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-02-21 15:46:17 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-02-21 15:46:17 +0400 |
| commit | 3436c41dee284b0338674d07025bf47ddfc3bb10 (patch) | |
| tree | 562e1b00ca2a396c06d183d16423ea4cf246e82b /source/blender | |
| parent | f1a0278e90889ce45bd9bac8140b7726c5d518de (diff) | |
Fix T38739: Simulations, unsupported in the Game Engine, could not be removed from the UI.
Also shorten info messages a bit.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index e11055fe278..bbc0b254205 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -943,9 +943,9 @@ static uiLayout *draw_modifier(uiLayout *layout, Scene *scene, Object *ob, uiBlockSetEmboss(block, UI_EMBOSSN); /* When Modifier is a simulation, show button to switch to context rather than the delete button. */ - if (modifier_can_delete(md) && !modifier_is_simulation(md)) + if (modifier_can_delete(md) && (!modifier_is_simulation(md) || STREQ(scene->r.engine, "BLENDER_GAME"))) uiItemO(row, "", ICON_X, "OBJECT_OT_modifier_remove"); - if (modifier_is_simulation(md) == 1) + else if (modifier_is_simulation(md) == 1) uiItemStringO(row, "", ICON_BUTS, "WM_OT_properties_context_change", "context", "PHYSICS"); else if (modifier_is_simulation(md) == 2) uiItemStringO(row, "", ICON_BUTS, "WM_OT_properties_context_change", "context", "PARTICLES"); |