diff options
| author | Bastien Montagne <bastien@blender.org> | 2022-03-28 18:34:36 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2022-03-29 18:59:55 +0300 |
| commit | 5596f79821caae3d4c1eb608ce77371904f74b80 (patch) | |
| tree | 92dbb06728dd7bbecfa71d17dbe25cde49dfdeb5 /source/blender/editors/armature/pose_edit.c | |
| parent | 354db59fb12a5ee595ae650ac3a736e3cc6df39d (diff) | |
LibOverride: Massive edits to 'editable' IDs checks in editors code.
Add new `BKE_id_is_editable` helper in `BKE_lib_id.h`, that supercedes
previous check (simple `ID_IS_LINKED()` macro) for many editing cases.
This allows to also take into account 'system override' (aka
non-editable override) case.
Ref: {T95707}.
Diffstat (limited to 'source/blender/editors/armature/pose_edit.c')
| -rw-r--r-- | source/blender/editors/armature/pose_edit.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/armature/pose_edit.c b/source/blender/editors/armature/pose_edit.c index 90ee7c83436..2ad7a373012 100644 --- a/source/blender/editors/armature/pose_edit.c +++ b/source/blender/editors/armature/pose_edit.c @@ -23,6 +23,7 @@ #include "BKE_deform.h" #include "BKE_global.h" #include "BKE_layer.h" +#include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_object.h" #include "BKE_report.h" @@ -78,7 +79,7 @@ Object *ED_pose_object_from_context(bContext *C) bool ED_object_posemode_enter_ex(struct Main *bmain, Object *ob) { - BLI_assert(!ID_IS_LINKED(ob)); + BLI_assert(BKE_id_is_editable(bmain, &ob->id)); bool ok = false; switch (ob->type) { @@ -99,11 +100,11 @@ bool ED_object_posemode_enter_ex(struct Main *bmain, Object *ob) bool ED_object_posemode_enter(bContext *C, Object *ob) { ReportList *reports = CTX_wm_reports(C); - if (ID_IS_LINKED(ob)) { + struct Main *bmain = CTX_data_main(C); + if (!BKE_id_is_editable(bmain, &ob->id)) { BKE_report(reports, RPT_WARNING, "Cannot pose libdata"); return false; } - struct Main *bmain = CTX_data_main(C); bool ok = ED_object_posemode_enter_ex(bmain, ob); if (ok) { WM_event_add_notifier(C, NC_SCENE | ND_MODE | NS_MODE_POSE, NULL); |