[Bf-blender-cvs] [1b45c52] master: Fix: Apply Scale to Delta Scale was doubling the effect

[Joshua Leung]

Commit: 1b45c52734a8320322c120c7580080e6fbbc4da6
Author: Joshua Leung
Date:   Sat Jul 9 11:52:41 2016 +1200
Branches: master
https://developer.blender.org/rB1b45c52734a8320322c120c7580080e6fbbc4da6

Fix: Apply Scale to Delta Scale was doubling the effect

===================================================================

M	release/scripts/startup/bl_operators/object.py

===================================================================

diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py
index 3658782..6356da2 100644
--- a/release/scripts/startup/bl_operators/object.py
+++ b/release/scripts/startup/bl_operators/object.py
@@ -762,7 +762,10 @@ class TransformsToDeltas(Operator):
                 obj.rotation_euler.zero()
 
     def transfer_scale(self, obj):
-        obj.delta_scale += obj.scale
+        obj.delta_scale[0] *= obj.scale[0]
+        obj.delta_scale[1] *= obj.scale[1]
+        obj.delta_scale[2] *= obj.scale[2]
+
         if self.reset_values:
             obj.scale[:] = (1, 1, 1)