Revision: 44139
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44139
Author: campbellbarton
Date: 2012-02-16 04:21:40 +0000 (Thu, 16 Feb 2012)
Log Message:
-----------
fix for replacing a generated image with a file, the image would stay generated.
not a show-stopper but confusing.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_image/image_ops.c
Modified: trunk/blender/source/blender/editors/space_image/image_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_ops.c
2012-02-16 04:08:52 UTC (rev 44138)
+++ trunk/blender/source/blender/editors/space_image/image_ops.c
2012-02-16 04:21:40 UTC (rev 44139)
@@ -886,6 +886,11 @@
/* we cant do much if the str is longer then FILE_MAX :/ */
BLI_strncpy(sima->image->name, str, sizeof(sima->image->name));
+ if (BLI_testextensie_array(str, imb_ext_movie))
+ sima->image->source= IMA_SRC_MOVIE;
+ else
+ sima->image->source= IMA_SRC_FILE;
+
/* XXX unpackImage frees image buffers */
ED_preview_kill_jobs(C);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
