diff options
| author | Ton Roosendaal <ton@blender.org> | 2010-12-27 22:26:38 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2010-12-27 22:26:38 +0300 |
| commit | b2be78c0ccbeb24995584ad7d5c70ae9f49ef04a (patch) | |
| tree | 6e660b3186714bf5b8e26a468748027529030003 /source/blender/modifiers/intern/MOD_util.c | |
| parent | 1a8cc0a8f051c92e03bee4ad9cb4ae0727b0a4e5 (diff) | |
Bugfix #25392
Compositor: Texture node didn't use texture-nodes itself.
Now composites initialize texture nodes correctly.
Also reviewed the fix for crashing texture nodes for displace.
It appears texture nodes also are used for sculpt/paint
brushes, in these cases it can be allowed again. But, don't
do this during rendering for now!
Diffstat (limited to 'source/blender/modifiers/intern/MOD_util.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_util.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c index de96684a2dd..cbf2bd8af4b 100644 --- a/source/blender/modifiers/intern/MOD_util.c +++ b/source/blender/modifiers/intern/MOD_util.c @@ -53,7 +53,8 @@ void get_texture_value(Tex *texture, float *tex_co, TexResult *texres) { int result_type; - result_type = multitex_ext(texture, tex_co, NULL, NULL, 0, texres); + /* no node textures for now */ + result_type = multitex_ext_safe(texture, tex_co, texres); /* if the texture gave an RGB value, we assume it didn't give a valid * intensity, so calculate one (formula from do_material_tex). |