[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50606] trunk/blender/source/blender/ collada/ImageExporter.cpp: Collada: #32549 partial fix: packed images now export correctly

[Gaia Clary]

Revision: 50606
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50606
Author:   gaiaclary
Date:     2012-09-14 22:31:26 +0000 (Fri, 14 Sep 2012)
Log Message:
-----------
Collada: #32549 partial fix: packed images now export correctly

Modified Paths:
--------------
    trunk/blender/source/blender/collada/ImageExporter.cpp

Modified: trunk/blender/source/blender/collada/ImageExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/ImageExporter.cpp	2012-09-14 19:15:55 UTC (rev 50605)
+++ trunk/blender/source/blender/collada/ImageExporter.cpp	2012-09-14 22:31:26 UTC (rev 50606)
@@ -74,6 +74,7 @@
 
 		short image_source = image->source;
 		bool  is_generated = image_source == IMA_SRC_GENERATED;
+		bool  is_packed    = image->packedfile != NULL;
 
 		char export_path[FILE_MAX];
 		char source_path[FILE_MAX];
@@ -83,7 +84,7 @@
 		// Destination folder for exported assets
 		BLI_split_dir_part(this->export_settings->filepath, export_dir, sizeof(export_dir));
 
-		if (is_generated || is_dirty || use_copies) {
+		if (is_generated || is_dirty || use_copies || is_packed) {
 
 			// make absolute destination path
 
@@ -96,7 +97,7 @@
 			BLI_make_existing_file(export_path);
 		}
 
-		if (is_generated || is_dirty) {
+		if (is_generated || is_dirty || is_packed) {
 
 			// This image in its current state only exists in Blender memory.
 			// So we have to export it. The export will keep the image state intact,