From 7b528b2a3ad33b3ad7328213669d8179528e254b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 22 Jan 2021 11:33:33 +1100 Subject: 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. --- source/blender/editors/include/ED_object.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source/blender/editors/include') 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); -- cgit v1.2.3