[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34042] trunk/blender/source/blender: Todo : Material nodes

[Ton Roosendaal]

Revision: 34042
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34042
Author:   ton
Date:     2011-01-03 16:50:08 +0100 (Mon, 03 Jan 2011)

Log Message:
-----------
Todo: Material nodes

- On each re-render, the node image was cleared. Skipping this gives
  nicer pictures
- Node render was using AA, but unfortunately only 1 sample for Nodes
  is being stored. Disable AA render for now, nice speedup too.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/node.c
    trunk/blender/source/blender/editors/render/render_preview.c

Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c	2011-01-03 15:29:37 UTC (rev 34041)
+++ trunk/blender/source/blender/blenkernel/intern/node.c	2011-01-03 15:50:08 UTC (rev 34042)
@@ -1270,8 +1270,7 @@
 		node->preview->xsize= xsize;
 		node->preview->ysize= ysize;
 	}
-	else
-		memset(node->preview->rect, 0, 4*xsize + xsize*ysize*sizeof(char)*4);
+	/* no clear, makes nicer previews */
 }
 
 void ntreeInitPreview(bNodeTree *ntree, int xsize, int ysize)

Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c	2011-01-03 15:29:37 UTC (rev 34041)
+++ trunk/blender/source/blender/editors/render/render_preview.c	2011-01-03 15:50:08 UTC (rev 34042)
@@ -995,7 +995,7 @@
 	else if(sp->pr_method==PR_NODE_RENDER) {
 		if(idtype == ID_MA) sce->r.scemode |= R_MATNODE_PREVIEW;
 		else if(idtype == ID_TE) sce->r.scemode |= R_TEXNODE_PREVIEW;
-		sce->r.mode |= R_OSA;
+		sce->r.mode &= ~R_OSA;
 	}
 	else {	/* PR_BUTS_RENDER */
 		sce->r.mode |= R_OSA;