[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57060] trunk/blender/source/blender/ editors/space_view3d/view3d_buttons.c: view3d buttons, internal change: make act_vert_def vertex argument optional.

Campbell Barton ideasman42 at gmail.com
Mon May 27 20:10:36 CEST 2013


Revision: 57060
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57060
Author:   campbellbarton
Date:     2013-05-27 18:10:36 +0000 (Mon, 27 May 2013)
Log Message:
-----------
view3d buttons, internal change: make act_vert_def vertex argument optional.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c	2013-05-27 18:08:14 UTC (rev 57059)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c	2013-05-27 18:10:36 UTC (rev 57060)
@@ -785,14 +785,14 @@
 			BMEditSelection *ese = (BMEditSelection *)em->bm->selected.last;
 
 			if (ese && ese->htype == BM_VERT) {
-				*r_eve = (BMVert *)ese->ele;
+				if (r_eve) *r_eve = (BMVert *)ese->ele;
 				*r_dvert = BM_ELEM_CD_GET_VOID_P(*r_eve, cd_dvert_offset);
 				return;
 			}
 		}
 	}
 
-	*r_eve = NULL;
+	if (r_eve) *r_eve = NULL;
 	*r_dvert = NULL;
 }
 
@@ -982,10 +982,9 @@
 {
 	Scene *scene = CTX_data_scene(C);
 	Object *ob = OBACT;
-	BMVert *eve_act;
 	MDeformVert *dvert_act;
 
-	act_vert_def(ob, &eve_act, &dvert_act);
+	act_vert_def(ob, NULL, &dvert_act);
 
 	return dvert_act ? dvert_act->totweight : 0;
 }
@@ -997,10 +996,9 @@
 	Scene *scene = CTX_data_scene(C);
 	Object *ob = OBACT;
 
-	BMVert *eve;
 	MDeformVert *dv;
 
-	act_vert_def(ob, &eve, &dv);
+	act_vert_def(ob, NULL, &dv);
 
 	if (dv && dv->totweight) {
 		uiLayout *col;




More information about the Bf-blender-cvs mailing list