diff options
| author | Peter Kim <pk15950@gmail.com> | 2022-04-03 05:10:23 +0300 |
|---|---|---|
| committer | Peter Kim <pk15950@gmail.com> | 2022-04-03 05:10:23 +0300 |
| commit | d34e2cc3be677ec0e0a26b4239b1d329e6822819 (patch) | |
| tree | fa933856589ff369ed739f38f603fca4f2458987 /source/blender/editors/transform/transform_convert_object.c | |
| parent | 07b0b6e9b78c9fc99f563244aec202acda536f2d (diff) | |
| parent | 79ff65d07bac0ecf0170542f86dc03a0228b53d5 (diff) | |
Merge branch 'master' into xr-dev
Diffstat (limited to 'source/blender/editors/transform/transform_convert_object.c')
| -rw-r--r-- | source/blender/editors/transform/transform_convert_object.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_convert_object.c b/source/blender/editors/transform/transform_convert_object.c index b599e282959..bd6c6bb120f 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; } |