[Bf-blender-cvs] [00618df] mesh-transfer-data: Some minor stupid bugfix.

[Bastien Montagne]

Commit: 00618df4d809ee703f37752dd85ea28913440125
Author: Bastien Montagne
Date:   Sun Nov 2 14:46:44 2014 +0100
Branches: mesh-transfer-data
https://developer.blender.org/rB00618df4d809ee703f37752dd85ea28913440125

Some minor stupid bugfix.

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

M       source/blender/editors/object/object_vgroup.c

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

diff --git a/source/blender/editors/object/object_vgroup.c 
b/source/blender/editors/object/object_vgroup.c
index 7c81ca8..460652a 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -756,7 +756,7 @@ static void vgroups_datatransfer_interp(const 
DataTransferLayerMapping *laymap,
        const int idx_dst = laymap->data_n_dst;
 
        const int mix_mode = laymap->mix_mode;
-       const int mix_factor = laymap->mix_factor;
+       const float mix_factor = laymap->mix_factor;
 
        int i, j;
 
@@ -787,7 +787,7 @@ static void vgroups_datatransfer_interp(const 
DataTransferLayerMapping *laymap,
                        float weight_dst_org = dw_dst ? dw_dst->weight : 0.0f;
                        switch (mix_mode) {
                                case CDT_MIX_MIX:
-                                       weight_dst = (weight_dst_org + 
weight_dst) / 2.0f;
+                                       /* Nothing to do, mere interp is enough 
here. */;
                                        break;
                                case CDT_MIX_ADD:
                                        weight_dst = weight_dst_org + 
weight_dst;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs