Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <bastien@blender.org>2022-03-28 18:34:36 +0300
committerBastien Montagne <bastien@blender.org>2022-03-29 18:59:55 +0300
commit5596f79821caae3d4c1eb608ce77371904f74b80 (patch)
tree92dbb06728dd7bbecfa71d17dbe25cde49dfdeb5 /source/blender/editors/transform
parent354db59fb12a5ee595ae650ac3a736e3cc6df39d (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/transform')
-rw-r--r--source/blender/editors/transform/transform_convert_object.c4
-rw-r--r--source/blender/editors/transform/transform_convert_sculpt.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/transform/transform_convert_object.c b/source/blender/editors/transform/transform_convert_object.c
index 1d187d01588..d2585493679 100644
--- a/source/blender/editors/transform/transform_convert_object.c
+++ b/source/blender/editors/transform/transform_convert_object.c
@@ -13,6 +13,7 @@
#include "BKE_animsys.h"
#include "BKE_context.h"
#include "BKE_layer.h"
+#include "BKE_lib_id.h"
#include "BKE_main.h"
#include "BKE_object.h"
#include "BKE_pointcache.h"
@@ -481,6 +482,7 @@ static void clear_trans_object_base_flags(TransInfo *t)
void createTransObject(bContext *C, TransInfo *t)
{
+ Main *bmain = CTX_data_main(C);
TransData *td = NULL;
TransDataExtension *tx;
const bool is_prop_edit = (t->flag & T_PROP_EDIT) != 0;
@@ -527,7 +529,7 @@ void createTransObject(bContext *C, TransInfo *t)
}
/* select linked objects, but skip them later */
- if (ID_IS_LINKED(ob)) {
+ if (!BKE_id_is_editable(bmain, &ob->id)) {
td->flag |= TD_SKIP;
}
diff --git a/source/blender/editors/transform/transform_convert_sculpt.c b/source/blender/editors/transform/transform_convert_sculpt.c
index 0c6214668ba..5bf6bfa8644 100644
--- a/source/blender/editors/transform/transform_convert_sculpt.c
+++ b/source/blender/editors/transform/transform_convert_sculpt.c
@@ -10,6 +10,7 @@
#include "BLI_math.h"
#include "BKE_context.h"
+#include "BKE_lib_id.h"
#include "BKE_paint.h"
#include "BKE_report.h"
@@ -27,7 +28,7 @@ void createTransSculpt(bContext *C, TransInfo *t)
TransData *td;
Scene *scene = t->scene;
- if (ID_IS_LINKED(scene)) {
+ if (!BKE_id_is_editable(CTX_data_main(C), &scene->id)) {
BKE_report(t->reports, RPT_ERROR, "Linked data can't text-space transform");
return;
}
@@ -102,7 +103,7 @@ void recalcData_sculpt(TransInfo *t)
void special_aftertrans_update__sculpt(bContext *C, TransInfo *t)
{
Scene *scene = t->scene;
- if (ID_IS_LINKED(scene)) {
+ if (!BKE_id_is_editable(CTX_data_main(C), &scene->id)) {
/* `ED_sculpt_init_transform` was not called in this case. */
return;
}