[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42252] trunk/blender/source/blender/ render/intern/source/convertblender.c: Fix #29411: displacement texture not working anymore, seems part of delta

[Brecht Van Lommel]

Revision: 42252
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42252
Author:   blendix
Date:     2011-11-29 12:12:12 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
Fix #29411: displacement texture not working anymore, seems part of delta
scale patch got accidentally committed in revision 41485, reverted now.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41485

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

Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c	2011-11-29 11:49:53 UTC (rev 42251)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c	2011-11-29 12:12:12 UTC (rev 42252)
@@ -2391,7 +2391,7 @@
 	/* Object Size with parenting */
 	obt=obr->ob;
 	while(obt){
-		mul_v3_v3v3(temp, obt->size, obt->dsize);
+		add_v3_v3v3(temp, obt->size, obt->dsize);
 		scale[0]*=temp[0]; scale[1]*=temp[1]; scale[2]*=temp[2];
 		obt=obt->parent;
 	}