svn merge ^/trunk/blender -r42261:42290
[blender.git] / source / blender / render / intern / source / convertblender.c
index e6e098ce0ce1c6e2b0f167cdee11bc72c03a095e..95c40508e86f29e04cb0b70574d33a6a83a217cd 100644 (file)
@@ -2391,7 +2391,7 @@ static void do_displacement(Render *re, ObjectRen *obr, float mat[][4], float im
        /* Object Size with parenting */
        obt=obr->ob;
        while(obt){
-               add_v3_v3v3(temp, obt->size, obt->dsize);
+               mul_v3_v3v3(temp, obt->size, obt->dsize);
                scale[0]*=temp[0]; scale[1]*=temp[1]; scale[2]*=temp[2];
                obt=obt->parent;
        }