[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44724] trunk/blender/source/blender/ editors/object/object_vgroup.c: Many vertex group functions assumed mesh object when lattices could be operated on too .
Campbell Barton
ideasman42 at gmail.com
Thu Mar 8 02:49:32 CET 2012
Revision: 44724
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44724
Author: campbellbarton
Date: 2012-03-08 01:49:25 +0000 (Thu, 08 Mar 2012)
Log Message:
-----------
Many vertex group functions assumed mesh object when lattices could be operated on too.
Modified Paths:
--------------
trunk/blender/source/blender/editors/object/object_vgroup.c
Modified: trunk/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_vgroup.c 2012-03-08 01:22:49 UTC (rev 44723)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c 2012-03-08 01:49:25 UTC (rev 44724)
@@ -702,8 +702,7 @@
int i, dvert_tot=0;
const int def_nr= ob->actdef-1;
- Mesh *me = ob->data;
- const int use_vert_sel= (me->editflag & ME_EDIT_VERT_SEL) != 0;
+ const int use_vert_sel = (ob->type == OB_MESH && ((Mesh *)ob->data)->editflag & ME_EDIT_VERT_SEL) != 0;
if (!BLI_findlink(&ob->defbase, def_nr)) {
return;
@@ -1103,8 +1102,7 @@
int i, dvert_tot=0;
const int def_nr= ob->actdef-1;
- Mesh *me = ob->data;
- const int use_vert_sel= (me->editflag & ME_EDIT_VERT_SEL) != 0;
+ const int use_vert_sel = (ob->type == OB_MESH && ((Mesh *)ob->data)->editflag & ME_EDIT_VERT_SEL) != 0;
if (!BLI_findlink(&ob->defbase, def_nr)) {
return;
@@ -1139,8 +1137,7 @@
int i, dvert_tot=0;
const int def_nr= ob->actdef-1;
- Mesh *me = ob->data;
- const int use_vert_sel= (me->editflag & ME_EDIT_VERT_SEL) != 0;
+ const int use_vert_sel = (ob->type == OB_MESH && ((Mesh *)ob->data)->editflag & ME_EDIT_VERT_SEL) != 0;
if (lock_active && !BLI_findlink(&ob->defbase, def_nr)) {
return;
@@ -1212,9 +1209,7 @@
MDeformVert *dv, **dvert_array=NULL;
int i, dvert_tot=0;
const int def_nr= ob->actdef-1;
-
- Mesh *me = ob->data;
- const int use_vert_sel= (me->editflag & ME_EDIT_VERT_SEL) != 0;
+ const int use_vert_sel = (ob->type == OB_MESH && ((Mesh *)ob->data)->editflag & ME_EDIT_VERT_SEL) != 0;
if (!BLI_findlink(&ob->defbase, def_nr)) {
return;
@@ -1346,9 +1341,7 @@
MDeformVert *dv, **dvert_array=NULL;
int i, dvert_tot=0;
const int def_nr= ob->actdef-1;
-
- Mesh *me = ob->data;
- const int use_vert_sel= (me->editflag & ME_EDIT_VERT_SEL) != 0;
+ const int use_vert_sel = (ob->type == OB_MESH && ((Mesh *)ob->data)->editflag & ME_EDIT_VERT_SEL) != 0;
if (!BLI_findlink(&ob->defbase, def_nr)) {
return;
@@ -1383,10 +1376,8 @@
static void vgroup_clean_all(Object *ob, const float epsilon, const int keep_single)
{
MDeformVert **dvert_array=NULL;
- int i, dvert_tot=0;
-
- Mesh *me = ob->data;
- const int use_vert_sel= (me->editflag & ME_EDIT_VERT_SEL) != 0;
+ int i, dvert_tot = 0;
+ const int use_vert_sel = (ob->type == OB_MESH && ((Mesh *)ob->data)->editflag & ME_EDIT_VERT_SEL) != 0;
ED_vgroup_give_parray(ob->data, &dvert_array, &dvert_tot, use_vert_sel);
@@ -1559,7 +1550,7 @@
/* object mode / weight paint */
MVert *mv, *mv_mirr;
int vidx, vidx_mirr;
- const int use_vert_sel= (me->editflag & ME_EDIT_VERT_SEL) != 0;
+ const int use_vert_sel = (me->editflag & ME_EDIT_VERT_SEL) != 0;
if (me->dvert == NULL) {
goto cleanup;
More information about the Bf-blender-cvs
mailing list