diff options
Diffstat (limited to 'source/blender/blenkernel/intern/context.c')
| -rw-r--r-- | source/blender/blenkernel/intern/context.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index 20a3d4ac7e0..6ca9b1dab04 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -953,10 +953,9 @@ SceneCollection *CTX_data_scene_collection(const bContext *C) return BKE_collection_master(scene); } -int CTX_data_mode_enum(const bContext *C) +int CTX_data_mode_enum_ex(const Object *obedit, const Object *ob) { - Object *obedit = CTX_data_edit_object(C); - + // Object *obedit = CTX_data_edit_object(C); if (obedit) { switch (obedit->type) { case OB_MESH: @@ -976,8 +975,7 @@ int CTX_data_mode_enum(const bContext *C) } } else { - Object *ob = CTX_data_active_object(C); - + // Object *ob = CTX_data_active_object(C); if (ob) { if (ob->mode & OB_MODE_POSE) return CTX_MODE_POSE; else if (ob->mode & OB_MODE_SCULPT) return CTX_MODE_SCULPT; @@ -991,6 +989,12 @@ int CTX_data_mode_enum(const bContext *C) return CTX_MODE_OBJECT; } +int CTX_data_mode_enum(const bContext *C) +{ + Object *obedit = CTX_data_edit_object(C); + Object *obact = obedit ? CTX_data_active_object(C) : NULL; + return CTX_data_mode_enum_ex(obedit, obact); +} /* would prefer if we can use the enum version below over this one - Campbell */ /* must be aligned with above enum */ |