diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-03-30 12:41:33 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-03-30 12:41:33 +0300 |
| commit | 3f6a74560e0ee4fb247e36e6ef2516a997316dba (patch) | |
| tree | 75080644daae244e3a11234a261b1ae9ee9e80ce /source/blender/editors/object/object_modifier.c | |
| parent | 35b731c9c8bdd996e9f418763f107a2e8e98516d (diff) | |
Layers: Scene->basact > SceneLayer->basact (more work)
This brings back adding hooks among other areas
Diffstat (limited to 'source/blender/editors/object/object_modifier.c')
| -rw-r--r-- | source/blender/editors/object/object_modifier.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 9f281b10f00..5d53768601c 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -873,6 +873,7 @@ static int modifier_remove_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); + SceneLayer *sl = CTX_data_scene_layer(C); Object *ob = ED_object_active_context(C); ModifierData *md = edit_modifier_property_get(op, ob, 0); int mode_orig = ob->mode; @@ -885,7 +886,7 @@ static int modifier_remove_exec(bContext *C, wmOperator *op) /* if cloth/softbody was removed, particle mode could be cleared */ if (mode_orig & OB_MODE_PARTICLE_EDIT) if ((ob->mode & OB_MODE_PARTICLE_EDIT) == 0) - if (scene->basact && scene->basact->object == ob) + if (sl->basact && sl->basact->object == ob) WM_event_add_notifier(C, NC_SCENE | ND_MODE | NS_MODE_OBJECT, NULL); return OPERATOR_FINISHED; |