[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55300] trunk/blender/source/blender: code cleanup: rename BKE_mesh_to_curve_ex --> BKE_mesh_to_curve_nurblist,
Campbell Barton
ideasman42 at gmail.com
Fri Mar 15 11:48:48 CET 2013
Revision: 55300
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55300
Author: campbellbarton
Date: 2013-03-15 10:48:48 +0000 (Fri, 15 Mar 2013)
Log Message:
-----------
code cleanup: rename BKE_mesh_to_curve_ex --> BKE_mesh_to_curve_nurblist,
also correct odd indentation.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_mesh.h
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/collada/ArmatureImporter.cpp
trunk/blender/source/blender/collada/MeshImporter.h
trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt_undo.c
trunk/blender/source/blender/editors/space_view3d/view3d_select.c
trunk/blender/source/blender/makesrna/intern/rna_ui_api.c
trunk/blender/source/blender/python/bmesh/bmesh_py_ops_call.c
Modified: trunk/blender/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_mesh.h 2013-03-15 10:45:43 UTC (rev 55299)
+++ trunk/blender/source/blender/blenkernel/BKE_mesh.h 2013-03-15 10:48:48 UTC (rev 55300)
@@ -169,7 +169,7 @@
struct MLoopUV **alluv, int *_totloop, int *_totpoly);
void BKE_mesh_from_nurbs_displist(struct Object *ob, struct ListBase *dispbase, int use_orco_uv);
void BKE_mesh_from_nurbs(struct Object *ob);
-void BKE_mesh_to_curve_ex(struct DerivedMesh *dm, struct ListBase *nurblist);
+void BKE_mesh_to_curve_nurblist(struct DerivedMesh *dm, struct ListBase *nurblist, const int edge_users_test);
void BKE_mesh_to_curve(struct Scene *scene, struct Object *ob);
void BKE_mesh_delete_material_index(struct Mesh *me, short index);
void BKE_mesh_smooth_flag_set(struct Object *meshOb, int enableSmooth);
Modified: trunk/blender/source/blender/blenkernel/intern/cloth.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cloth.c 2013-03-15 10:45:43 UTC (rev 55299)
+++ trunk/blender/source/blender/blenkernel/intern/cloth.c 2013-03-15 10:48:48 UTC (rev 55300)
@@ -788,7 +788,7 @@
verts->goal = powf(verts->goal, 4.0f);
if ( verts->goal >= SOFTGOALSNAP )
- verts->flags |= CLOTH_VERT_FLAG_PINNED;
+ verts->flags |= CLOTH_VERT_FLAG_PINNED;
}
if (clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_SCALING ) {
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2013-03-15 10:45:43 UTC (rev 55299)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2013-03-15 10:48:48 UTC (rev 55300)
@@ -1586,7 +1586,7 @@
BLI_addtail(lb, vl);
}
-void BKE_mesh_to_curve_ex(DerivedMesh *dm, ListBase *nurblist)
+void BKE_mesh_to_curve_nurblist(DerivedMesh *dm, ListBase *nurblist, const int edge_users_test)
{
MVert *mverts = dm->getVertArray(dm);
MEdge *med, *medge = dm->getEdgeArray(dm);
@@ -1616,10 +1616,8 @@
/* create edges from all faces (so as to find edges not in any faces) */
med = medge;
for (i = 0; i < totedge; i++, med++) {
- if (edge_users[i] == 0) {
+ if (edge_users[i] == edge_users_test) {
EdgeLink *edl = MEM_callocN(sizeof(EdgeLink), "EdgeLink");
-
- // BLI_edgehash_insert(eh_edge, med->v1, med->v2, NULL);
edl->edge = med;
BLI_addtail(&edges, edl); totedges++;
@@ -1728,7 +1726,7 @@
ListBase nurblist = {NULL, NULL};
bool needsFree = false;
- BKE_mesh_to_curve_ex(dm, &nurblist);
+ BKE_mesh_to_curve_nurblist(dm, &nurblist, 0);
if (nurblist.first) {
Curve *cu = BKE_curve_add(G.main, ob->id.name + 2, OB_CURVE);
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2013-03-15 10:45:43 UTC (rev 55299)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2013-03-15 10:48:48 UTC (rev 55300)
@@ -4072,7 +4072,7 @@
if (sound == NULL || sound->playback_handle == NULL) {
#if 0
- if (op)
+ if (op)
BKE_report(op->reports, RPT_ERROR, "Unsupported audio format");
#endif
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2013-03-15 10:45:43 UTC (rev 55299)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2013-03-15 10:48:48 UTC (rev 55300)
@@ -6082,7 +6082,7 @@
soops->treestore->totelem = soops->treestore->usedelem;
soops->storeflag |= SO_TREESTORE_CLEANUP; // at first draw
}
- soops->tree.first = soops->tree.last= NULL;
+ soops->tree.first = soops->tree.last= NULL;
}
else if (sl->spacetype == SPACE_IMAGE) {
SpaceImage *sima = (SpaceImage *)sl;
@@ -10412,7 +10412,7 @@
PackedFile *pf = mainptr->curlib->packedfile;
BKE_reportf_wrap(basefd->reports, RPT_INFO, TIP_("Read packed library: '%s'"),
- mainptr->curlib->name);
+ mainptr->curlib->name);
fd = blo_openblendermemory(pf->data, pf->size, basefd->reports);
@@ -10421,7 +10421,7 @@
}
else {
BKE_reportf_wrap(basefd->reports, RPT_INFO, TIP_("Read library: '%s', '%s'"),
- mainptr->curlib->filepath, mainptr->curlib->name);
+ mainptr->curlib->filepath, mainptr->curlib->name);
fd = blo_openblenderfile(mainptr->curlib->filepath, basefd->reports);
}
/* allow typing in a new lib path */
Modified: trunk/blender/source/blender/collada/ArmatureImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/ArmatureImporter.cpp 2013-03-15 10:45:43 UTC (rev 55299)
+++ trunk/blender/source/blender/collada/ArmatureImporter.cpp 2013-03-15 10:48:48 UTC (rev 55300)
@@ -134,10 +134,10 @@
// set parent tail
if (parent && totchild == 1) {
- copy_v3_v3(parent->tail, bone->head);
+ copy_v3_v3(parent->tail, bone->head);
// not setting BONE_CONNECTED because this would lock child bone location with respect to parent
- bone->flag |= BONE_CONNECTED;
+ bone->flag |= BONE_CONNECTED;
// XXX increase this to prevent "very" small bones?
const float epsilon = 0.000001f;
Modified: trunk/blender/source/blender/collada/MeshImporter.h
===================================================================
--- trunk/blender/source/blender/collada/MeshImporter.h 2013-03-15 10:45:43 UTC (rev 55299)
+++ trunk/blender/source/blender/collada/MeshImporter.h 2013-03-15 10:48:48 UTC (rev 55300)
@@ -154,22 +154,22 @@
virtual Mesh *get_mesh_by_geom_uid(const COLLADAFW::UniqueId& geom_uid);
MTex *assign_textures_to_uvlayer(COLLADAFW::TextureCoordinateBinding &ctexture,
- Mesh *me, TexIndexTextureArrayMap& texindex_texarray_map,
- MTex *color_texture);
+ Mesh *me, TexIndexTextureArrayMap& texindex_texarray_map,
+ MTex *color_texture);
void optimize_material_assignements();
MTFace *assign_material_to_geom(COLLADAFW::MaterialBinding cmaterial,
- std::map<COLLADAFW::UniqueId, Material*>& uid_material_map,
- Object *ob, const COLLADAFW::UniqueId *geom_uid,
- char *layername, MTFace *texture_face,
- std::map<Material*, TexIndexTextureArrayMap>& material_texture_mapping_map, short mat_index);
+ std::map<COLLADAFW::UniqueId, Material*>& uid_material_map,
+ Object *ob, const COLLADAFW::UniqueId *geom_uid,
+ char *layername, MTFace *texture_face,
+ std::map<Material*, TexIndexTextureArrayMap>& material_texture_mapping_map, short mat_index);
Object *create_mesh_object(COLLADAFW::Node *node, COLLADAFW::InstanceGeometry *geom,
- bool isController,
- std::map<COLLADAFW::UniqueId, Material*>& uid_material_map,
- std::map<Material*, TexIndexTextureArrayMap>& material_texture_mapping_map);
+ bool isController,
+ std::map<COLLADAFW::UniqueId, Material*>& uid_material_map,
+ std::map<Material*, TexIndexTextureArrayMap>& material_texture_mapping_map);
// create a mesh storing a pointer in a map so it can be retrieved later by geometry UID
bool write_geometry(const COLLADAFW::Geometry* geom);
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c 2013-03-15 10:45:43 UTC (rev 55299)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c 2013-03-15 10:48:48 UTC (rev 55300)
@@ -287,7 +287,7 @@
/* XXX: meh, this is round about because
* BKE_brush_jitter_pos isn't written in the best way to
* be reused here */
- if(factor != 1.0) {
+ if(factor != 1.0f) {
sub_v2_v2v2(delta, mouse_out, mouse_in);
mul_v2_fl(delta, factor);
add_v2_v2v2(mouse_out, mouse_in, delta);
Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt_undo.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt_undo.c 2013-03-15 10:45:43 UTC (rev 55299)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt_undo.c 2013-03-15 10:48:48 UTC (rev 55300)
@@ -760,9 +760,9 @@
BLI_lock_thread(LOCK_CUSTOM1);
if (ss->bm ||
- ELEM(type,
- SCULPT_UNDO_DYNTOPO_BEGIN,
- SCULPT_UNDO_DYNTOPO_END))
+ ELEM(type,
+ SCULPT_UNDO_DYNTOPO_BEGIN,
+ SCULPT_UNDO_DYNTOPO_END))
{
/* Dynamic topology stores only one undo node per stroke,
* regardless of the number of PBVH nodes modified */
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_select.c 2013-03-15 10:45:43 UTC (rev 55299)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_select.c 2013-03-15 10:48:48 UTC (rev 55300)
@@ -732,7 +732,7 @@
MetaBall *mb = (MetaBall *)vc->obedit->data;
if (extend == 0 && select)
- BKE_mball_deselect_all(mb);
+ BKE_mball_deselect_all(mb);
BLI_lasso_boundbox(&rect, mcords, moves);
Modified: trunk/blender/source/blender/makesrna/intern/rna_ui_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_ui_api.c 2013-03-15 10:45:43 UTC (rev 55299)
+++ trunk/blender/source/blender/makesrna/intern/rna_ui_api.c 2013-03-15 10:48:48 UTC (rev 55300)
@@ -595,7 +595,7 @@
func = RNA_def_function(srna, "label", "rna_uiItemL");
RNA_def_function_ui_description(func, "Item. Display text and/or icon in the layout");
- api_ui_item_common(func);
+ api_ui_item_common(func);
parm = RNA_def_property(func, "icon_value", PROP_INT, PROP_UNSIGNED);
RNA_def_property_ui_text(parm, "Icon Value",
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list