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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2009-10-07 18:48:29 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2009-10-07 18:48:29 +0400
commitcf4f00b2fa6dfecc400519a635c41798bf45ca88 (patch)
tree342967b2b2a1254a23aca3c8e0ae22a7009e86f2 /source/blender/nodes/intern/TEX_nodes/TEX_viewer.c
parent17c083a38f3a5269a3224b632f0bc129d831dc5d (diff)
Preview Render:
* Fixes for texture and material nodes. * Texture node previews now work more like materials.
Diffstat (limited to 'source/blender/nodes/intern/TEX_nodes/TEX_viewer.c')
-rw-r--r--source/blender/nodes/intern/TEX_nodes/TEX_viewer.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c b/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c
index 2d29b03b38c..5ebd971d9fb 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c
@@ -39,7 +39,16 @@ static bNodeSocketType outputs[]= {
static void exec(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
{
- tex_do_preview(node, in[0], data);
+ TexCallData *cdata = (TexCallData *)data;
+
+ if(cdata->do_preview) {
+ TexParams params;
+ float col[4];
+ params_from_cdata(&params, cdata);
+
+ tex_input_rgba(col, in[0], &params, cdata->thread);
+ tex_do_preview(node, params.coord, col);
+ }
}
bNodeType tex_node_viewer = {