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:
authorCampbell Barton <ideasman42@gmail.com>2010-02-19 17:08:41 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-02-19 17:08:41 +0300
commit3b9fdfa9e1905a01230be7b15174c711c2b0f974 (patch)
treebe544cf955c6c47ce7593fe4d6b694b825a575fd /source/blender/editors
parent4755ab9f80df7ed52366b7928658e89c54fa15ac (diff)
dont allow linking an object into a linked scene.
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/object/object_relations.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index 1eeae97b312..71b0dd82252 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -1143,6 +1143,11 @@ static int make_links_scene_exec(bContext *C, wmOperator *op)
return OPERATOR_CANCELLED;
}
+ if(scene_to->id.lib) {
+ BKE_report(op->reports, RPT_ERROR, "Can't link objects into a linked scene");
+ return OPERATOR_CANCELLED;
+ }
+
CTX_DATA_BEGIN(C, Base*, base, selected_bases)
{
if(!object_in_scene(base->object, scene_to)) {