Revision: 46850 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46850 Author: cyborgmuppet Date: 2012-05-21 17:39:56 +0000 (Mon, 21 May 2012) Log Message: ----------- Fixed SELECT comparisons
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-21 17:00:08 UTC (rev 46849) +++ branches/meshdata_transfer/source/blender/editors/object/object_vgroup.c 2012-05-21 17:39:56 UTC (rev 46850) @@ -479,7 +479,7 @@ dw_dst = defvert_verify_index(*dv_array_dst, index_dst); if(mode == 1) dw_dst->weight = dw_src->weight; else if(mode == 2) {if(!dw_dst->weight || dw_dst->weight == 0) dw_dst->weight = dw_src->weight;} - else if(mode == 3) {if(mv_src->flag == 1) dw_dst->weight = dw_src->weight;} + else if(mode == 3) {if(mv_src->flag & SELECT) dw_dst->weight = dw_src->weight;} else return 0; } return 1; @@ -551,7 +551,7 @@ dw_dst = defvert_verify_index(*dv_array_dst, index_dst); if(mode == 1) dw_dst->weight = dw_src->weight; else if(mode == 2) {if(!dw_dst->weight || dw_dst->weight == 0) dw_dst->weight = dw_src->weight;} - else if(mode == 3) {if(mv_src[nearest.index].flag == 1) dw_dst->weight = dw_src->weight;} + else if(mode == 3) {if(mv_src[nearest.index].flag & SELECT) dw_dst->weight = dw_src->weight;} else return 0; } /*free memory and return*/ @@ -646,8 +646,7 @@ dw_dst = defvert_verify_index(*dv_array_dst, index_dst); if(mode == 1) dw_dst->weight = dw_src->weight; else if(mode == 2) {if(!dw_dst->weight || dw_dst->weight == 0) dw_dst->weight = dw_src->weight;} - /*ATTENTION: face select in weightpaint mode seems reversed. Might create bug when fixed*/ - else if(mode == 3) {if(mface_src[nearest.index].flag != SELECT) dw_dst->weight = dw_src->weight;} + else if(mode == 3) {if(mface_src[nearest.index].flag & ME_FACE_SEL) dw_dst->weight = dw_src->weight;} else return 0; } /*free memory and return*/ @@ -737,8 +736,7 @@ dw_dst = defvert_verify_index(*dv_array_dst, index_dst); if(mode == 1) dw_dst->weight = weight; else if(mode == 2) {if(!dw_dst->weight || dw_dst->weight == 0) dw_dst->weight = weight;} - /*ATTENTION: face select in weightpaint mode seems reversed. Might create bug when fixed*/ - else if(mode == 3) {if(mface_src[nearest.index].flag != SELECT) dw_dst->weight = weight;} + else if(mode == 3) {if(mface_src[nearest.index].flag & ME_FACE_SEL) dw_dst->weight = weight;} else return 0; } /*free memory and return*/ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs