[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50775] trunk/blender/source/blender/ editors/space_node/node_view.c: Fix #32607: Color picker tool doesn' t work properly: always pick black.

[Sergey Sharybin]

Revision: 50775
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50775
Author:   nazgul
Date:     2012-09-20 10:38:12 +0000 (Thu, 20 Sep 2012)
Log Message:
-----------
Fix #32607: Color picker tool doesn't work properly: always pick black.

Regressions since color picking support from background image.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_node/node_view.c

Modified: trunk/blender/source/blender/editors/space_node/node_view.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_view.c	2012-09-20 10:07:49 UTC (rev 50774)
+++ trunk/blender/source/blender/editors/space_node/node_view.c	2012-09-20 10:38:12 UTC (rev 50775)
@@ -358,6 +358,13 @@
 	float fx, fy, bufx, bufy;
 	int ret = FALSE;
 
+	if (snode->treetype != NTREE_COMPOSIT || (snode->flag & SNODE_BACKDRAW) == 0) {
+		/* use viewer image for color sampling only if we're in compositor tree
+		 * with backdrop enabled
+		 */
+		return FALSE;
+	}
+
 	ima = BKE_image_verify_viewer(IMA_TYPE_COMPOSITE, "Viewer Node");
 	ibuf = BKE_image_acquire_ibuf(ima, NULL, &lock);
 	if (!ibuf) {