[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49034] trunk/blender/source/blender/ editors: Add Skin modifier's radius values to Transform panel (in 3D views) .
Bastien Montagne
montagne29 at wanadoo.fr
Wed Jul 18 16:30:31 CEST 2012
Revision: 49034
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49034
Author: mont29
Date: 2012-07-18 14:30:31 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
Add Skin modifier's radius values to Transform panel (in 3D views).
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
trunk/blender/source/blender/editors/transform/transform.c
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c 2012-07-18 14:03:10 UTC (rev 49033)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c 2012-07-18 14:30:31 UTC (rev 49034)
@@ -93,7 +93,7 @@
float ob_scale[3]; /* need temp space due to linked values */
float ob_dims[3];
short link_scale;
- float ve_median[7];
+ float ve_median[9];
int curdef;
float *defweightp;
} TransformProperties;
@@ -135,13 +135,13 @@
uiBlock *block = (layout) ? uiLayoutAbsoluteBlock(layout) : NULL;
MDeformVert *dvert = NULL;
TransformProperties *tfp;
- float median[7], ve_median[7];
- int tot, totw, totweight, totedge, totradius;
+ float median[9], ve_median[9];
+ int tot, totw, totweight, totedge, totradius, totskinradius;
char defstr[320];
PointerRNA radius_ptr;
- median[0] = median[1] = median[2] = median[3] = median[4] = median[5] = median[6] = 0.0;
- tot = totw = totweight = totedge = totradius = 0;
+ median[0] = median[1] = median[2] = median[3] = median[4] = median[5] = median[6] = median[7] = median[8] = 0.0;
+ tot = totw = totweight = totedge = totradius = totskinradius = 0;
defstr[0] = 0;
/* make sure we got storage */
@@ -159,9 +159,17 @@
BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) {
if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
+ MVertSkin *vs;
+
evedef = eve;
tot++;
add_v3_v3(median, eve->co);
+
+ vs = (MVertSkin *)CustomData_bmesh_get(&bm->vdata, eve->head.data, CD_MVERT_SKIN);
+ if (vs) {
+ add_v2_v2(median + 7, vs->radius); /* Third val not used currently. */
+ totskinradius++;
+ }
}
}
@@ -304,6 +312,10 @@
median[4] /= (float)totweight;
if (totradius)
median[5] /= (float)totradius;
+ if (totskinradius) {
+ median[7] /= (float)totskinradius;
+ median[8] /= (float)totskinradius;
+ }
if (v3d->flag & V3D_GLOBAL_STATS)
mul_m4_v3(ob->obmat, median);
@@ -373,6 +385,23 @@
&(tfp->ve_median[5]), 0.0, 100.0, 1, 3, TIP_("Radius of curve control points"));
}
+ if (totskinradius == 1) {
+ uiDefButF(block, NUM, B_OBJECTPANELMEDIAN, IFACE_("Radius X:"),
+ 0, yi -= buth + but_margin, 200, buth,
+ &(tfp->ve_median[7]), 0.0, 100.0, 1, 3, TIP_("X radius used by Skin modifier"));
+ uiDefButF(block, NUM, B_OBJECTPANELMEDIAN, IFACE_("Radius Y:"),
+ 0, yi -= buth + but_margin, 200, buth,
+ &(tfp->ve_median[8]), 0.0, 100.0, 1, 3, TIP_("Y radius used by Skin modifier"));
+ }
+ else if (totskinradius > 1) {
+ uiDefButF(block, NUM, B_OBJECTPANELMEDIAN, IFACE_("Mean Radius X:"),
+ 0, yi -= buth + but_margin, 200, buth,
+ &(tfp->ve_median[7]), 0.0, 100.0, 1, 3, TIP_("Median X radius used by Skin modifier"));
+ uiDefButF(block, NUM, B_OBJECTPANELMEDIAN, IFACE_("Mean Radius Y:"),
+ 0, yi -= buth + but_margin, 200, buth,
+ &(tfp->ve_median[8]), 0.0, 100.0, 1, 3, TIP_("Median Y radius used by Skin modifier"));
+ }
+
if (totedge == 1) {
uiDefButF(block, NUM, B_OBJECTPANELMEDIAN, IFACE_("Crease:"),
0, yi -= buth + but_margin, 200, buth,
@@ -407,6 +436,8 @@
median[4] = ve_median[4] - median[4];
median[5] = ve_median[5] - median[5];
median[6] = ve_median[6] - median[6];
+ median[7] = ve_median[7] - median[7];
+ median[8] = ve_median[8] - median[8];
if (ob->type == OB_MESH) {
Mesh *me = ob->data;
@@ -501,6 +532,55 @@
}
}
}
+
+ if (median[7] != 0.0f) {
+ BMVert *eve;
+ /* That one is not clamped to [0.0, 1.0]. */
+ float sca = ve_median[7];
+ if (ve_median[7] - median[7] == 0.0f) {
+ BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) {
+ if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
+ MVertSkin *vs = (MVertSkin *)CustomData_bmesh_get(&bm->vdata, eve->head.data, CD_MVERT_SKIN);
+ if (vs)
+ vs->radius[0] = sca;
+ }
+ }
+ }
+ else {
+ sca /= (ve_median[7] - median[7]);
+ BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) {
+ if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
+ MVertSkin *vs = (MVertSkin *)CustomData_bmesh_get(&bm->vdata, eve->head.data, CD_MVERT_SKIN);
+ if (vs)
+ vs->radius[0] *= sca;
+ }
+ }
+ }
+ }
+ if (median[8] != 0.0f) {
+ BMVert *eve;
+ /* That one is not clamped to [0.0, 1.0]. */
+ float sca = ve_median[8];
+ if (ve_median[8] - median[8] == 0.0f) {
+ BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) {
+ if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
+ MVertSkin *vs = (MVertSkin *)CustomData_bmesh_get(&bm->vdata, eve->head.data, CD_MVERT_SKIN);
+ if (vs)
+ vs->radius[1] = sca;
+ }
+ }
+ }
+ else {
+ sca /= (ve_median[8] - median[8]);
+ BM_ITER_MESH (eve, &iter, bm, BM_VERTS_OF_MESH) {
+ if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
+ MVertSkin *vs = (MVertSkin *)CustomData_bmesh_get(&bm->vdata, eve->head.data, CD_MVERT_SKIN);
+ if (vs)
+ vs->radius[1] *= sca;
+ }
+ }
+ }
+ }
EDBM_mesh_normals_update(em);
}
else if (ELEM(ob->type, OB_CURVE, OB_SURF)) {
Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c 2012-07-18 14:03:10 UTC (rev 49033)
+++ trunk/blender/source/blender/editors/transform/transform.c 2012-07-18 14:30:31 UTC (rev 49034)
@@ -4920,7 +4920,7 @@
if (BM_elem_flag_test(e2, BM_ELEM_SELECT))
continue;
- /* This test is only relevant if object is not wire-dranw! See [#32068]. */
+ /* This test is only relevant if object is not wire-drawn! See [#32068]. */
if (v3d && t->obedit->dt > OB_WIRE && v3d->drawtype > OB_WIRE &&
!BMBVH_EdgeVisible(btree, e2, ar, v3d, t->obedit))
continue;
More information about the Bf-blender-cvs
mailing list