diff options
| author | Matt Ebb <matt@mke3.net> | 2010-04-26 06:23:13 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2010-04-26 06:23:13 +0400 |
| commit | 47e1f253c59c3108159732c30da89a7ad154261b (patch) | |
| tree | bb92c96756ff9447acbc7de19961c914950dbbce /source/blender/blenkernel/intern/brush.c | |
| parent | 4fc4fb9bfb11a2a1cb416ef6044ecc61735f0bf6 (diff) | |
Fix [#22160] blender 2.5 alpha2 can't open file grass.blend from blenderguru
Textures were being called with multitex_ext with osatex enabled, but NULL derivates.
Fixed this for texture effectors and a couple of other places.
Diffstat (limited to 'source/blender/blenkernel/intern/brush.c')
| -rw-r--r-- | source/blender/blenkernel/intern/brush.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 4b8c3a2a0f4..dedf82b6dcc 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -930,7 +930,7 @@ unsigned int *brush_gen_texture_cache(Brush *br, int half_side) co[2]= 0.0f; /* This is copied from displace modifier code */ - hasrgb = multitex_ext(mtex->tex, co, NULL, NULL, 1, &texres); + hasrgb = multitex_ext(mtex->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). |