[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13841] trunk/blender/source/blender/src/ drawnode.c:

[Brecht Van Lommel]

Revision: 13841
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13841
Author:   blendix
Date:     2008-02-24 13:16:27 +0100 (Sun, 24 Feb 2008)

Log Message:
-----------

Fix for bug #8331: compositor nodes backdrop displays in material nodes.
Fix for bug #8083: backdrop not displaying centered in the window.

Fixes for both provided by Fabian Boehlke, thanks!

Modified Paths:
--------------
    trunk/blender/source/blender/src/drawnode.c

Modified: trunk/blender/source/blender/src/drawnode.c
===================================================================
--- trunk/blender/source/blender/src/drawnode.c	2008-02-24 12:12:05 UTC (rev 13840)
+++ trunk/blender/source/blender/src/drawnode.c	2008-02-24 12:16:27 UTC (rev 13841)
@@ -2237,7 +2237,7 @@
 	
 	draw_nodespace_grid(snode);
 	
-	if(snode->flag & SNODE_BACKDRAW) {
+	if((snode->flag & SNODE_BACKDRAW) && snode->treetype==NTREE_COMPOSIT) {
 		Image *ima= BKE_image_verify_viewer(IMA_TYPE_COMPOSITE, "Viewer Node");
 		ImBuf *ibuf= BKE_image_get_ibuf(ima, NULL);
 		if(ibuf) {
@@ -2249,7 +2249,7 @@
 			myortho2(-0.375, sa->winx-0.375, -0.375, sa->winy-0.375);
 			
 			x = (sa->winx-ibuf->x)/2 + snode->xof;
-			y = (sa->winx-ibuf->y)/2 + snode->yof;
+			y = (sa->winy-ibuf->y)/2 + snode->yof;
 			
 			if(ibuf->rect)
 				glaDrawPixelsSafe(x, y, ibuf->x, ibuf->y, ibuf->x, GL_RGBA, GL_UNSIGNED_BYTE, ibuf->rect);