[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59733] trunk/blender/source/blender/ blenkernel/intern/image.c: Fix for the BKE_image_walk_all_users function: This included a check for movie/ sequence image types meant for the original use to set IMA_NEED_FRAME_RECALC flag .

Lukas Toenne lukas.toenne at googlemail.com
Mon Sep 2 15:45:57 CEST 2013


Revision: 59733
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59733
Author:   lukastoenne
Date:     2013-09-02 13:45:57 +0000 (Mon, 02 Sep 2013)
Log Message:
-----------
Fix for the BKE_image_walk_all_users function: This included a check for movie/sequence image types meant for the original use to set IMA_NEED_FRAME_RECALC flag. But the function name suggests it should be generic, so better move this filter into the callback.

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

Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c	2013-09-02 12:51:53 UTC (rev 59732)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2013-09-02 13:45:57 UTC (rev 59733)
@@ -2149,9 +2149,7 @@
 	/* texture users */
 	for (tex = mainp->tex.first; tex; tex = tex->id.next) {
 		if (tex->type == TEX_IMAGE && tex->ima) {
-			if (ELEM(tex->ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE)) {
-				callback(tex->ima, &tex->iuser, customdata);
-			}
+			callback(tex->ima, &tex->iuser, customdata);
 		}
 	}
 
@@ -2193,7 +2191,7 @@
 {
 	Image *changed_image = customdata;
 
-	if (ima == changed_image) {
+	if (ima == changed_image && ELEM(ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE)) {
 		iuser->flag |= IMA_NEED_FRAME_RECALC;
 	}
 }




More information about the Bf-blender-cvs mailing list