[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42505] branches/bmesh/blender/source/ blender: removed some bmesh todo comments which are not needed and minor edits on previous commit .
Campbell Barton
ideasman42 at gmail.com
Thu Dec 8 01:28:48 CET 2011
Revision: 42505
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42505
Author: campbellbarton
Date: 2011-12-08 00:28:42 +0000 (Thu, 08 Dec 2011)
Log Message:
-----------
removed some bmesh todo comments which are not needed and minor edits on previous commit.
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
branches/bmesh/blender/source/blender/editors/mesh/editbmesh_add.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c 2011-12-08 00:18:57 UTC (rev 42504)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c 2011-12-08 00:28:42 UTC (rev 42505)
@@ -1546,7 +1546,7 @@
Object *ob,
DerivedMesh *dm)
{
- DerivedMesh *result = CDDM_copy(dm, 0); /* BMESH_TODO second argument untested, may be incorrect - campbell */
+ DerivedMesh *result = CDDM_copy(dm, 0);
if(pmd->canvas && !(pmd->canvas->flags & MOD_DPAINT_BAKING)) {
@@ -1756,7 +1756,7 @@
/* make a copy of dm to use as brush data */
if (pmd->brush) {
if (pmd->brush->dm) pmd->brush->dm->release(pmd->brush->dm);
- pmd->brush->dm = CDDM_copy(result, 0); /* BMESH_TODO untested second argument - campbell */
+ pmd->brush->dm = CDDM_copy(result, 0);
}
return result;
@@ -1774,7 +1774,7 @@
void canvas_copyDerivedMesh(DynamicPaintCanvasSettings *canvas, DerivedMesh *dm)
{
if (canvas->dm) canvas->dm->release(canvas->dm);
- canvas->dm = CDDM_copy(dm, 0); /* BMESH_TODO second argument untested, may be incorrect - campbell */
+ canvas->dm = CDDM_copy(dm, 0);
}
/*
@@ -1929,7 +1929,7 @@
{
int numOfFaces = dm->getNumTessFaces(dm);
MFace *mface = dm->getTessFaceArray(dm);
- MTFace *tface = CustomData_get_layer_named(&dm->faceData, CD_MTFACE, uvname); /* BMESH_TODO, is this data valid?, possibly need loop uv's */
+ MTFace *tface = CustomData_get_layer_named(&dm->faceData, CD_MTFACE, uvname);
/* Get closest edge to that subpixel on UV map */
{
@@ -3022,7 +3022,7 @@
scene->r.subframe = prev_sfra;
subframe_updateObject(scene, ob, UPDATE_EVERYTHING, BKE_curframe(scene));
- dm_p = CDDM_copy(brush->dm, 0); /* BMESH_TODO second argument untested, may be incorrect - campbell */
+ dm_p = CDDM_copy(brush->dm, 0);
numOfVerts_p = dm_p->getNumVerts(dm_p);
mvert_p = dm_p->getVertArray(dm_p);
copy_m4_m4(prev_obmat, ob->obmat);
@@ -3126,7 +3126,7 @@
Bounds3D mesh_bb = {0};
VolumeGrid *grid = bData->grid;
- dm = CDDM_copy(brush->dm, 0); /* BMESH_TODO second argument untested, may be incorrect - campbell */
+ dm = CDDM_copy(brush->dm, 0);
mvert = dm->getVertArray(dm);
mface = dm->getTessFaceArray(dm);
numOfVerts = dm->getNumVerts(dm);
Modified: branches/bmesh/blender/source/blender/editors/mesh/editbmesh_add.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/editbmesh_add.c 2011-12-08 00:18:57 UTC (rev 42504)
+++ branches/bmesh/blender/source/blender/editors/mesh/editbmesh_add.c 2011-12-08 00:28:42 UTC (rev 42505)
@@ -182,10 +182,10 @@
em = me->edit_btmesh;
if (!EDBM_CallAndSelectOpf(em, op, "vertout",
- "create_grid xsegments=%i ysegments=%i size=%f mat=%m4", 1, 1, sqrt(2.0), mat))
+ "create_grid xsegments=%i ysegments=%i size=%f mat=%m4", 1, 1, M_SQRT2, mat))
return OPERATOR_CANCELLED;
- /* BMESH_TODO make plane side this: sqrt(2.0f) - plane (diameter of 1.41 makes it unit size) */
+ /* BMESH_TODO make plane side this: M_SQRT2 - plane (diameter of 1.41 makes it unit size) */
make_prim_finish(C, &state, enter_editmode);
return OPERATOR_FINISHED;
@@ -229,7 +229,7 @@
if (!EDBM_CallAndSelectOpf(em, op, "vertout", "create_cube mat=%m4 size=%f", mat, 2.0f))
return OPERATOR_CANCELLED;
- /* BMESH_TODO make plane side this: sqrt(2.0f) - plane (diameter of 1.41 makes it unit size) */
+ /* BMESH_TODO make plane side this: M_SQRT2 - plane (diameter of 1.41 makes it unit size) */
make_prim_finish(C, &state, enter_editmode);
return OPERATOR_FINISHED;
Modified: branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c 2011-12-08 00:18:57 UTC (rev 42504)
+++ branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c 2011-12-08 00:28:42 UTC (rev 42505)
@@ -1480,8 +1480,6 @@
RNA_def_property_struct_type(prop, "MeshUVLoop");
RNA_def_property_collection_funcs(prop, "rna_MeshUVLoopLayer_data_begin", "rna_iterator_array_next", "rna_iterator_array_end", "rna_iterator_array_get", "rna_MeshUVLoopLayer_data_length", NULL, NULL, NULL);
- /* BMESH_TODO: add active/clone/render properties */
-
srna= RNA_def_struct(brna, "MeshUVLoop", NULL);
RNA_def_struct_sdna(srna, "MLoopUV");
RNA_def_struct_path_func(srna, "rna_MeshUVLoop_path");
@@ -1495,11 +1493,11 @@
prop= RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MLOOPUV_VERTSEL);
- RNA_def_property_ui_text(prop, "UV Pinned", "");
+ RNA_def_property_ui_text(prop, "UV Select", "");
prop= RNA_def_property(srna, "select_edge", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MLOOPUV_EDGESEL);
- RNA_def_property_ui_text(prop, "UV Pinned", "");
+ RNA_def_property_ui_text(prop, "UV Edge Select", "");
}
static void rna_def_mtface(BlenderRNA *brna)
More information about the Bf-blender-cvs
mailing list