[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13960] trunk/blender/source/blender/ render/intern/source/texture.c:

[Brecht Van Lommel]

Revision: 13960
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13960
Author:   blendix
Date:     2008-03-03 19:53:06 +0100 (Mon, 03 Mar 2008)

Log Message:
-----------

Bugfix: displacement with object texture mapping could crash.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/texture.c

Modified: trunk/blender/source/blender/render/intern/source/texture.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/texture.c	2008-03-03 17:16:29 UTC (rev 13959)
+++ trunk/blender/source/blender/render/intern/source/texture.c	2008-03-03 18:53:06 UTC (rev 13960)
@@ -1468,7 +1468,7 @@
 					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) {