diff options
| author | Lukas Steiblys <imbusy@imbusy.org> | 2009-10-02 02:29:15 +0400 |
|---|---|---|
| committer | Lukas Steiblys <imbusy@imbusy.org> | 2009-10-02 02:29:15 +0400 |
| commit | 0677398a649b6b8c293df3ce3c6668f0a3be3bc8 (patch) | |
| tree | 9d510a5bd23559bf4fae670ed04d7e5d6c12578c /source/blender/nodes/intern/TEX_util.c | |
| parent | 59248e9f62006ba05e3098e4d213f3dcb23fe711 (diff) | |
| parent | bc942eceacb638735dc4f4f68252c4c207147a70 (diff) | |
merge from 23153 to 23595soc-2009-imbusy
Diffstat (limited to 'source/blender/nodes/intern/TEX_util.c')
| -rw-r--r-- | source/blender/nodes/intern/TEX_util.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/source/blender/nodes/intern/TEX_util.c b/source/blender/nodes/intern/TEX_util.c index 2c21627dad9..f2333ffcf2e 100644 --- a/source/blender/nodes/intern/TEX_util.c +++ b/source/blender/nodes/intern/TEX_util.c @@ -47,8 +47,6 @@ #define PREV_RES 128 /* default preview resolution */ -int preview_flag = 0; - void tex_call_delegate(TexDelegate *dg, float *out, TexParams *params, short thread) { if(dg->node->need_exec) @@ -217,7 +215,8 @@ void ntreeTexExecTree( short thread, Tex *tex, short which_output, - int cfra + int cfra, + int preview ){ TexResult dummy_texres; TexCallData data; @@ -231,21 +230,14 @@ void ntreeTexExecTree( data.dxt = dxt; data.dyt = dyt; data.target = texres; - data.do_preview = preview_flag; + data.do_preview = preview; data.thread = thread; data.which_output = which_output; data.cfra= cfra; - preview_flag = 0; - ntreeExecTree(nodes, &data, thread); } -void ntreeTexSetPreviewFlag(int doit) -{ - preview_flag = doit; -} - char* ntreeTexOutputMenu(bNodeTree *ntree) { bNode *node; |