[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32122] trunk/blender/source/blender/ blenkernel/intern/image.c: Fix #23690: threading crash with compositing nodes and scopes view.

[Brecht Van Lommel]

Revision: 32122
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32122
Author:   blendix
Date:     2010-09-25 18:35:02 +0200 (Sat, 25 Sep 2010)

Log Message:
-----------
Fix #23690: threading crash with compositing nodes and scopes view.

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	2010-09-25 14:32:26 UTC (rev 32121)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2010-09-25 16:35:02 UTC (rev 32122)
@@ -2020,14 +2020,9 @@
 		ibuf= image_get_ibuf(ima, IMA_NO_INDEX, 0);
 	}
 	else if(ima->source == IMA_SRC_VIEWER) {
-		if(ima->type==IMA_TYPE_R_RESULT) {
-			/* always verify entirely, not that this shouldn't happen
-			 * during render anyway */
-		}
-		else if(ima->type==IMA_TYPE_COMPOSITE) {
-			frame= iuser?iuser->framenr:0;
-			ibuf= image_get_ibuf(ima, 0, frame);
-		}
+		/* always verify entirely, not that this shouldn't happen
+		 * as part of texture sampling in rendering anyway, so not
+		 * a big bottleneck */
 	}
 
 	*frame_r = frame;