diff options
| author | Matt Ebb <matt@mke3.net> | 2010-03-09 03:35:05 +0300 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2010-03-09 03:35:05 +0300 |
| commit | f03a17d0f935a0f33114dea24ede731b721c307e (patch) | |
| tree | dbfd5448522f571c341dfac9c0b45eda13976647 /source/blender/blenkernel/intern/modifier.c | |
| parent | d1bf196de1f4fb35921a383e15f2c87e3333f702 (diff) | |
* Fix for crash using texture nodes in displace modifier
Modifier code was asking for filtered textures without sending derivatives.
Disabled this and also checks for filtered/non-filtered.
Brecht, I assumed this was ok due to the existence of the p->osatex variable
- if this isn't what you had in mind, please change or let me know :)
Diffstat (limited to 'source/blender/blenkernel/intern/modifier.c')
| -rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 601bee4f670..c5a420b85a8 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -3508,8 +3508,7 @@ static void get_texture_value(Tex *texture, float *tex_co, TexResult *texres) { int result_type; - result_type = multitex_ext(texture, tex_co, NULL, - NULL, 1, texres); + result_type = multitex_ext(texture, tex_co, NULL, NULL, 0, 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). |