[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54790] trunk/blender/source/blender/ blenloader/intern/readfile.c: Bug fix in 2.66 release, irc submitted.

Ton Roosendaal ton at blender.org
Sat Feb 23 15:52:40 CET 2013


Revision: 54790
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54790
Author:   ton
Date:     2013-02-23 14:52:40 +0000 (Sat, 23 Feb 2013)
Log Message:
-----------
Bug fix in 2.66 release, irc submitted.

File with packed images crashes on load.

Do-versions now is copying Images, because texture "use alpha" has been removed...
However, it then also copied packaged images, which crashes for some reason.

For now I skip packed image copy, which keeps blender work. This versioning
code needs more checking though.

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-02-23 14:31:46 UTC (rev 54789)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2013-02-23 14:52:40 UTC (rev 54790)
@@ -8714,7 +8714,8 @@
 						if (image == blo_do_versions_newlibadr(fd, otex->id.lib, otex->ima))
 							break;
 
-				if (otex) {
+				/* no duplication for packed files */
+				if (otex && image->packedfile == NULL) {
 					/* copy image datablock */
 					nimage = BKE_image_copy(main, image);
 					nimage->flag |= IMA_IGNORE_ALPHA|IMA_DONE_TAG;




More information about the Bf-blender-cvs mailing list