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
path: root/source
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2008-03-03 21:53:06 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2008-03-03 21:53:06 +0300
commitb26a76792307be3a1406d2c8786a6f4fdac7352e (patch)
tree7aaa4220990a6848883f408de7a4f3e225b3b512 /source
parent27c9fb7c6be6cbbf0fd3469a4534044c32e3fc0e (diff)
Bugfix: displacement with object texture mapping could crash.
Diffstat (limited to 'source')
-rw-r--r--source/blender/render/intern/source/texture.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c
index 831fe5dcc0b..f418ec52985 100644
--- a/source/blender/render/intern/source/texture.c
+++ b/source/blender/render/intern/source/texture.c
@@ -1468,7 +1468,7 @@ void do_material_tex(ShadeInput *shi)
dx= dxt;
dy= dyt;
VECCOPY(tempvec, shi->co);
- if(shi->obi->duplitexmat)
+ if(shi->obi && shi->obi->duplitexmat)
MTC_Mat4MulVecfl(shi->obi->duplitexmat, tempvec);
MTC_Mat4MulVecfl(ob->imat, tempvec);
if(shi->osatex) {