[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44600] trunk/blender/source/blender/ editors: bmesh minor changes
Campbell Barton
ideasman42 at gmail.com
Fri Mar 2 11:49:25 CET 2012
Revision: 44600
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44600
Author: campbellbarton
Date: 2012-03-02 10:49:15 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
bmesh minor changes
* dont check selection and hiddent state (select + hide isnt allowed and api ensures this)
* MESH_OT_noise had incorrect check for texture (checked if slot [0] was filled but then used active texture)
Modified Paths:
--------------
trunk/blender/source/blender/editors/mesh/bmesh_select.c
trunk/blender/source/blender/editors/mesh/bmesh_tools.c
trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
Modified: trunk/blender/source/blender/editors/mesh/bmesh_select.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/bmesh_select.c 2012-03-02 10:30:11 UTC (rev 44599)
+++ trunk/blender/source/blender/editors/mesh/bmesh_select.c 2012-03-02 10:49:15 UTC (rev 44600)
@@ -1894,7 +1894,7 @@
}
else {
BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
- if (BM_elem_flag_test(v, BM_ELEM_SELECT) && !BM_elem_flag_test(v, BM_ELEM_HIDDEN)) {
+ if (BM_elem_flag_test(v, BM_ELEM_SELECT)) {
BM_elem_flag_enable(v, BM_ELEM_TAG);
}
else {
@@ -2470,7 +2470,7 @@
BMIter liter;
BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, f) {
- if (BM_elem_flag_test(l->v, BM_ELEM_SELECT) && !BM_elem_flag_test(l->v, BM_ELEM_HIDDEN)) {
+ if (BM_elem_flag_test(l->v, BM_ELEM_SELECT)) {
BM_elem_flag_enable(l->next->v, BM_ELEM_TAG);
BM_elem_select_set(em->bm, l->v, FALSE);
}
Modified: trunk/blender/source/blender/editors/mesh/bmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/bmesh_tools.c 2012-03-02 10:30:11 UTC (rev 44599)
+++ trunk/blender/source/blender/editors/mesh/bmesh_tools.c 2012-03-02 10:49:15 UTC (rev 44600)
@@ -1372,7 +1372,7 @@
if (!eed) {
BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) {
- if (BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
+ if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
/* de-select the edge before */
do_deselect = TRUE;
break;
@@ -4356,20 +4356,22 @@
BMIter iter;
float fac = RNA_float_get(op->ptr, "factor");
- if (em == NULL) return OPERATOR_FINISHED;
+ if (em == NULL) {
+ return OPERATOR_FINISHED;
+ }
- ma = give_current_material(obedit, obedit->actcol);
- if (ma == 0 || ma->mtex[0] == 0 || ma->mtex[0]->tex == 0) {
+ if ((ma = give_current_material(obedit, obedit->actcol)) == NULL ||
+ (tex = give_current_material_texture(ma)) == NULL)
+ {
BKE_report(op->reports, RPT_WARNING, "Mesh has no material or texture assigned");
return OPERATOR_FINISHED;
}
- tex = give_current_material_texture(ma);
if (tex->type == TEX_STUCCI) {
float b2, vec[3];
float ofs = tex->turbul / 200.0;
BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
- if (BM_elem_flag_test(eve, BM_ELEM_SELECT) && !BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) {
+ if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
b2 = BLI_hnoise(tex->noisesize, eve->co[0], eve->co[1], eve->co[2]);
if (tex->stype) ofs *= (b2 * b2);
vec[0] = fac * (b2 - BLI_hnoise(tex->noisesize, eve->co[0] + ofs, eve->co[1], eve->co[2]));
@@ -4382,7 +4384,7 @@
}
else {
BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
- if (BM_elem_flag_test(eve, BM_ELEM_SELECT) && !BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) {
+ if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
float tin, dum;
externtex(ma->mtex[0], eve->co, &tin, &dum, &dum, &dum, &dum, 0);
eve->co[2] += fac * tin;
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c 2012-03-02 10:30:11 UTC (rev 44599)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c 2012-03-02 10:49:15 UTC (rev 44600)
@@ -436,9 +436,9 @@
BM_ITER(eed, &iter, bm, BM_EDGES_OF_MESH, NULL) {
if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
float *crease = (float *)CustomData_bmesh_get(&bm->edata, eed->head.data, CD_CREASE);
- if (!crease)
- break;
- *crease = sca;
+ if (crease) {
+ *crease = sca;
+ }
}
}
}
@@ -446,10 +446,10 @@
BM_ITER(eed, &iter, bm, BM_EDGES_OF_MESH, NULL) {
if (BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
float *crease = (float *)CustomData_bmesh_get(&bm->edata, eed->head.data, CD_CREASE);
- if (!crease)
- break;
- *crease *= sca;
- CLAMP(*crease, 0.0f, 1.0f);
+ if (crease) {
+ *crease *= sca;
+ CLAMP(*crease, 0.0f, 1.0f);
+ }
}
}
}
@@ -457,10 +457,10 @@
BM_ITER(eed, &iter, bm, BM_EDGES_OF_MESH, NULL) {
if (BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
float *crease = (float *)CustomData_bmesh_get(&bm->edata, eed->head.data, CD_CREASE);
- if (!crease)
- break;
- *crease = 1.0f + ((1.0f - *crease) * sca);
- CLAMP(*crease, 0.0f, 1.0f);
+ if (crease) {
+ *crease = 1.0f + ((1.0f - *crease) * sca);
+ CLAMP(*crease, 0.0f, 1.0f);
+ }
}
}
}
@@ -474,9 +474,9 @@
BM_ITER(eed, &iter, bm, BM_EDGES_OF_MESH, NULL) {
if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
float *bweight = (float *)CustomData_bmesh_get(&bm->edata, eed->head.data, CD_BWEIGHT);
- if (!bweight)
- break;
- *bweight = sca;
+ if (bweight) {
+ *bweight = sca;
+ }
}
}
}
@@ -484,10 +484,10 @@
BM_ITER(eed, &iter, bm, BM_EDGES_OF_MESH, NULL) {
if (BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
float *bweight = (float *)CustomData_bmesh_get(&bm->edata, eed->head.data, CD_BWEIGHT);
- if (!bweight)
- break;
- *bweight *= sca;
- CLAMP(*bweight, 0.0f, 1.0f);
+ if (bweight) {
+ *bweight *= sca;
+ CLAMP(*bweight, 0.0f, 1.0f);
+ }
}
}
}
@@ -495,10 +495,10 @@
BM_ITER(eed, &iter, bm, BM_EDGES_OF_MESH, NULL) {
if (BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
float *bweight = (float *)CustomData_bmesh_get(&bm->edata, eed->head.data, CD_BWEIGHT);
- if (!bweight)
- break;
- *bweight = 1.0f + ((1.0f - *bweight) * sca);
- CLAMP(*bweight, 0.0f, 1.0f);
+ if (bweight) {
+ *bweight = 1.0f + ((1.0f - *bweight) * sca);
+ CLAMP(*bweight, 0.0f, 1.0f);
+ }
}
}
}
More information about the Bf-blender-cvs
mailing list