diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-01-22 03:33:33 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-01-22 04:38:55 +0300 |
commit | 7b528b2a3ad33b3ad7328213669d8179528e254b (patch) | |
tree | 8fcf33d4ff47f7d5519b8b7a769c5c04e05bccb2 /source/blender/editors/include/ED_object.h | |
parent | 99e5d5ba21a44a9caa4f10b86c5065b916a096b4 (diff) |
Fix T84920: Crash undoing object activation in the outliner
Regression from d8992192e5512380f57433df113f3e3f8b22f7cb
The original code relied on having a separate edit-object pointer
than the active object.
Use a utility function to avoid code duplication as there are
other areas that have similar functionality.
Diffstat (limited to 'source/blender/editors/include/ED_object.h')
-rw-r--r-- | source/blender/editors/include/ED_object.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index 1fbc1339aa5..7ba2992b8fe 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -173,6 +173,7 @@ void ED_object_parent_clear(struct Object *ob, const int type); void ED_object_base_select(struct Base *base, eObjectSelect_Mode mode); void ED_object_base_activate(struct bContext *C, struct Base *base); +void ED_object_base_activate_with_mode_exit_if_needed(struct bContext *C, struct Base *base); void ED_object_base_active_refresh(struct Main *bmain, struct Scene *scene, struct ViewLayer *view_layer); |