Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2011-01-03 18:50:08 +0300
committerTon Roosendaal <ton@blender.org>2011-01-03 18:50:08 +0300
commit2ad8175597d1306429a4246ad14e470b506f7b3b (patch)
tree020dbc66187621a879b59f5c16d3bbddec6f3e29
parent9676902006f4181e84c6eff6da64b393c46a34e9 (diff)
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.
-rw-r--r--source/blender/blenkernel/intern/node.c3
-rw-r--r--source/blender/editors/render/render_preview.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index db11b42ee1e..bd126ab12c2 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -1270,8 +1270,7 @@ static void node_init_preview(bNode *node, int xsize, int ysize)
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)
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index efe30533ac2..2dee51ac448 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -995,7 +995,7 @@ static void shader_preview_render(ShaderPreview *sp, ID *id, int split, int firs
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;