From ea6de7626efdfca82e9140a8d8b0a7537be857fd Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 8 Dec 2011 00:28:42 +0000 Subject: removed some bmesh todo comments which are not needed and minor edits on previous commit. --- source/blender/blenkernel/intern/dynamicpaint.c | 12 ++++++------ source/blender/editors/mesh/editbmesh_add.c | 6 +++--- source/blender/makesrna/intern/rna_mesh.c | 6 ++---- 3 files changed, 11 insertions(+), 13 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 9c2ea70c0c8..c7a2a3752e9 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -1546,7 +1546,7 @@ static struct DerivedMesh *dynamicPaint_Modifier_apply(DynamicPaintModifierData 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 @@ static struct DerivedMesh *dynamicPaint_Modifier_apply(DynamicPaintModifierData /* 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 dynamicPaint_cacheUpdateFrames(DynamicPaintSurface *surface) 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 @@ static int dynamicPaint_findNeighbourPixel(PaintUVPoint *tempPoints, DerivedMesh { 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 @@ static void dynamicPaint_brushMeshCalculateVelocity(Scene *scene, Object *ob, Dy 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 @@ static int dynamicPaint_paintMesh(DynamicPaintSurface *surface, 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); diff --git a/source/blender/editors/mesh/editbmesh_add.c b/source/blender/editors/mesh/editbmesh_add.c index 0a489dcc864..c527fb9c043 100644 --- a/source/blender/editors/mesh/editbmesh_add.c +++ b/source/blender/editors/mesh/editbmesh_add.c @@ -182,10 +182,10 @@ static int add_primitive_plane_exec(bContext *C, wmOperator *op) 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 @@ static int add_primitive_cube_exec(bContext *C, wmOperator *op) 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; diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index d41c093c09b..1330c57974d 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -1480,8 +1480,6 @@ static void rna_def_mloopuv(BlenderRNA *brna) 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 @@ static void rna_def_mloopuv(BlenderRNA *brna) 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) -- cgit v1.2.3