[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60224] trunk/blender/source/blender/ blenkernel/intern/bpath.c: Fix warnings message on load about packed images :

[Brecht Van Lommel]

Revision: 60224
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60224
Author:   blendix
Date:     2013-09-18 19:35:13 +0000 (Wed, 18 Sep 2013)
Log Message:
-----------
Fix warnings message on load about packed images:
ERROR: Image not available. Keeping packed image

This was due to recent bugfix for #36639, the image should only be reloaded if
the path actually changed and it's not a packed file.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/bpath.c

Modified: trunk/blender/source/blender/blenkernel/intern/bpath.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/bpath.c	2013-09-18 18:55:12 UTC (rev 60223)
+++ trunk/blender/source/blender/blenkernel/intern/bpath.c	2013-09-18 19:35:13 UTC (rev 60224)
@@ -422,9 +422,12 @@
 			ima = (Image *)id;
 			if (ima->packedfile == NULL || (flag & BKE_BPATH_TRAVERSE_SKIP_PACKED) == 0) {
 				if (ELEM3(ima->source, IMA_SRC_FILE, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE)) {
-					rewrite_path_fixed(ima->name, visit_cb, absbase, bpath_user_data);
-					BKE_image_signal(ima, NULL, IMA_SIGNAL_RELOAD);
-					BKE_image_walk_all_users(bmain, ima, bpath_traverse_image_user_cb);
+					if (rewrite_path_fixed(ima->name, visit_cb, absbase, bpath_user_data)) {
+						if (!ima->packedfile) {
+							BKE_image_signal(ima, NULL, IMA_SIGNAL_RELOAD);
+							BKE_image_walk_all_users(bmain, ima, bpath_traverse_image_user_cb);
+						}
+					}
 				}
 			}
 			break;