[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47292] branches/meshdata_transfer/source/ blender/editors/object/object_vgroup.c: Fixes to bugs that appeared during restructure.

[Ove Murberg Henriksen]

Revision: 47292
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47292
Author:   cyborgmuppet
Date:     2012-05-31 19:09:23 +0000 (Thu, 31 May 2012)
Log Message:
-----------
Fixes to bugs that appeared during restructure.

Modified Paths:
--------------
    branches/meshdata_transfer/source/blender/editors/object/object_vgroup.c

Modified: branches/meshdata_transfer/source/blender/editors/object/object_vgroup.c
===================================================================
--- branches/meshdata_transfer/source/blender/editors/object/object_vgroup.c	2012-05-31 19:06:52 UTC (rev 47291)
+++ branches/meshdata_transfer/source/blender/editors/object/object_vgroup.c	2012-05-31 19:09:23 UTC (rev 47292)
@@ -426,7 +426,7 @@
 			break;
 
 		case REPLACE_EMPTY_WEIGHTS:
-			if (!weight_dst || weight_dst == 0) *weight_dst = weight_src;
+			if (*weight_dst == 0) *weight_dst = weight_src;
 			break;
 
 		case REPLACE_SELECTED_WEIGHTS:
@@ -493,8 +493,8 @@
 			for(i = 0, dv_src = dv_array_src, dv_dst = dv_array_dst; i < me_dst->totvert; i++, dv_dst++, dv_src++, mv_src++) {
 
 				/* copy weight */
-				dw_src = defvert_verify_index(*dv_array_src, index_src);
-				dw_dst = defvert_verify_index(*dv_array_dst, index_dst);
+				dw_src = defvert_verify_index(*dv_src, index_src);
+				dw_dst = defvert_verify_index(*dv_dst, index_dst);
 				vgroup_transfer_weight(mv_dst, &dw_dst->weight, dw_src->weight, replace_option);
 			}
 			break;
@@ -504,7 +504,7 @@
 			bvhtree_from_mesh_verts(&tree_mesh_vertices_src, dmesh_src, 0.0, 2, 6);
 
 			/* loop trough vertices */
-			for(i = 0, dv_dst = dv_array_dst; i < me_dst->totvert; i++, dv_dst++, mv_src++){
+			for(i = 0, dv_dst = dv_array_dst; i < me_dst->totvert; i++, dv_dst++, mv_dst++){
 
 				/* reset nearest */
 				/* nearest.index = -1; It is asumed using index of previous search as starting point result in speedup. It will be tested later */
@@ -519,7 +519,7 @@
 
 				/* copy weight */
 				dw_src = defvert_verify_index(dv_array_src[nearest.index], index_src);
-				dw_dst = defvert_verify_index(*dv_array_dst, index_dst);
+				dw_dst = defvert_verify_index(*dv_dst, index_dst);
 				vgroup_transfer_weight(mv_dst, &dw_dst->weight, dw_src->weight, replace_option);
 			}
 
@@ -536,7 +536,7 @@
 			bvhtree_from_mesh_faces(&tree_mesh_faces_src, dmesh_src, 0.0, 2, 6);
 
 			/* loop through the vertices */
-			for(i = 0, dv_dst = dv_array_dst; i < me_dst->totvert; i++, dv_dst++, mv_src++) {
+			for(i = 0, dv_dst = dv_array_dst; i < me_dst->totvert; i++, dv_dst++, mv_dst++) {
 
 				/* reset nearest */
 				/* nearest.index = -1; It is asumed using index of previous search as starting point result in speedup. It will be tested later */
@@ -572,7 +572,7 @@
 				}
 
 				/* copy weight */
-				dw_dst = defvert_verify_index(*dv_array_dst, index_dst);
+				dw_dst = defvert_verify_index(*dv_dst, index_dst);
 				vgroup_transfer_weight(mv_dst, &dw_dst->weight, weight, replace_option);
 			}
 
@@ -589,7 +589,7 @@
 			bvhtree_from_mesh_faces(&tree_mesh_faces_src, dmesh_src, 0.0, 2, 6);
 
 			/* loop through the vertices */
-			for(i = 0, dv_dst = dv_array_dst; i < me_dst->totvert; i++, dv_src++, mv_src++){
+			for(i = 0, dv_dst = dv_array_dst; i < me_dst->totvert; i++, dv_dst++, mv_dst++){
 
 				/* reset nearest */
 				/* nearest.index = -1; It is asumed using index of previous search as starting point result in speedup. It will be tested later */
@@ -621,7 +621,7 @@
 
 				/* copy weight */
 				dw_src = defvert_verify_index(dv_array_src[index_nearest_vertex], index_src);
-				dw_dst = defvert_verify_index(*dv_array_dst, index_dst);
+				dw_dst = defvert_verify_index(*dv_dst, index_dst);
 				vgroup_transfer_weight(mv_dst, &dw_dst->weight, dw_src->weight, replace_option);
 			}