[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55610] trunk/blender/source/blender/ blenloader/intern/readfile.c: fix [#34776] Linking the group in this . blend causes crash with this starting scene
Campbell Barton
ideasman42 at gmail.com
Wed Mar 27 00:46:55 CET 2013
Revision: 55610
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55610
Author: campbellbarton
Date: 2013-03-26 23:46:54 +0000 (Tue, 26 Mar 2013)
Log Message:
-----------
fix [#34776] Linking the group in this .blend causes crash with this starting scene
disallow linked objects to be in editmode.
Modified Paths:
--------------
trunk/blender/source/blender/blenloader/intern/readfile.c
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2013-03-26 22:45:06 UTC (rev 55609)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2013-03-26 23:46:54 UTC (rev 55610)
@@ -4774,11 +4774,14 @@
/* weak weak... this was only meant as draw flag, now is used in give_base_to_objects too */
ob->flag &= ~OB_FROMGROUP;
-
+
/* loading saved files with editmode enabled works, but for undo we like
- * to stay in object mode during undo presses so keep editmode disabled */
- if (fd->memfile)
+ * to stay in object mode during undo presses so keep editmode disabled.
+ *
+ * Also when linking in a file don't allow editmode: [#34776] */
+ if (fd->memfile || (ob->id.flag & (LIB_EXTERN | LIB_INDIRECT))) {
ob->mode &= ~(OB_MODE_EDIT | OB_MODE_PARTICLE_EDIT);
+ }
ob->disp.first = ob->disp.last = NULL;
More information about the Bf-blender-cvs
mailing list