[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27023] trunk/blender/source/blender/ editors/object/object_relations.c: dont allow linking an object into a linked scene.
Campbell Barton
ideasman42 at gmail.com
Fri Feb 19 15:08:41 CET 2010
Revision: 27023
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27023
Author: campbellbarton
Date: 2010-02-19 15:08:41 +0100 (Fri, 19 Feb 2010)
Log Message:
-----------
dont allow linking an object into a linked scene.
Modified Paths:
--------------
trunk/blender/source/blender/editors/object/object_relations.c
Modified: trunk/blender/source/blender/editors/object/object_relations.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_relations.c 2010-02-19 13:13:21 UTC (rev 27022)
+++ trunk/blender/source/blender/editors/object/object_relations.c 2010-02-19 14:08:41 UTC (rev 27023)
@@ -1143,6 +1143,11 @@
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)) {
More information about the Bf-blender-cvs
mailing list