Revision: 56056
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56056
Author: campbellbarton
Date: 2013-04-15 08:43:17 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
minor edits to DM_update_weight_mcol(), skip getting vars when in editmode,
also remove old/invalid comment.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/editors/mesh/editmesh_add.c
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
2013-04-15 07:58:15 UTC (rev 56055)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
2013-04-15 08:43:17 UTC (rev 56056)
@@ -1200,12 +1200,8 @@
{
BMEditMesh *em = (dm->type == DM_TYPE_EDITBMESH) ?
BMEdit_FromObject(ob) : NULL;
unsigned char (*wtcol_v)[4];
- unsigned char(*wtcol_l)[4] =
CustomData_get_layer(dm->getLoopDataLayout(dm), CD_PREVIEW_MLOOPCOL);
- MLoop *mloop = dm->getLoopArray(dm), *ml;
- MPoly *mp = dm->getPolyArray(dm);
int numVerts = dm->getNumVerts(dm);
- int totloop;
- int i, j;
+ int i;
if (em) {
if (em->derivedVertColor && em->derivedVertColorLen ==
numVerts) {
@@ -1248,6 +1244,12 @@
/* editmesh draw function checks spesifically for this */
}
else {
+ unsigned char(*wtcol_l)[4] =
CustomData_get_layer(dm->getLoopDataLayout(dm), CD_PREVIEW_MLOOPCOL);
+ MLoop *mloop = dm->getLoopArray(dm), *ml;
+ MPoly *mp = dm->getPolyArray(dm);
+ int totloop;
+ int j;
+
/* now add to loops, so the data can be passed through the
modifier stack */
/* If no CD_PREVIEW_MLOOPCOL existed yet, we have to add a new
one! */
if (!wtcol_l) {
Modified: trunk/blender/source/blender/editors/mesh/editmesh_add.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_add.c 2013-04-15
07:58:15 UTC (rev 56055)
+++ trunk/blender/source/blender/editors/mesh/editmesh_add.c 2013-04-15
08:43:17 UTC (rev 56056)
@@ -53,8 +53,6 @@
/* ********* add primitive operators ************* */
-/* BMESH_TODO: 'state' is not a good name, should be flipped and called
'was_editmode',
- * or at least something more descriptive */
static Object *make_prim_init(bContext *C, const char *idname,
float *dia, float mat[4][4],
bool *was_editmode, const float loc[3], const
float rot[3], const unsigned int layer)
@@ -246,13 +244,12 @@
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
bool enter_editmode;
- int cap_end, cap_tri;
unsigned int layer;
bool was_editmode;
+ const int end_fill_type = RNA_enum_get(op->ptr, "end_fill_type");
+ const bool cap_end = (end_fill_type != 0);
+ const bool cap_tri = (end_fill_type == 2);
- cap_end = RNA_enum_get(op->ptr, "end_fill_type");
- cap_tri = (cap_end == 2);
-
ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode,
&layer, NULL);
obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH,
"Cylinder"), &dia, mat, &was_editmode, loc, rot, layer);
em = BMEdit_FromObject(obedit);
@@ -308,13 +305,12 @@
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
bool enter_editmode;
- int cap_end, cap_tri;
unsigned int layer;
bool was_editmode;
+ const int end_fill_type = RNA_enum_get(op->ptr, "end_fill_type");
+ const bool cap_end = (end_fill_type != 0);
+ const bool cap_tri = (end_fill_type == 2);
- cap_end = RNA_enum_get(op->ptr, "end_fill_type");
- cap_tri = (cap_end == 2);
-
ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode,
&layer, NULL);
obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Cone"),
&dia, mat, &was_editmode, loc, rot, layer);
em = BMEdit_FromObject(obedit);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
