Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/mesh/meshtools.c')
-rw-r--r--source/blender/editors/mesh/meshtools.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c
index c4fe5f8fbc1..763e82b8b53 100644
--- a/source/blender/editors/mesh/meshtools.c
+++ b/source/blender/editors/mesh/meshtools.c
@@ -1,4 +1,4 @@
-/**
+/*
* $Id$
*
* ***** BEGIN GPL LICENSE BLOCK *****
@@ -27,6 +27,11 @@
* ***** END GPL LICENSE BLOCK *****
*/
+/** \file blender/editors/mesh/meshtools.c
+ * \ingroup edmesh
+ */
+
+
/*
meshtools.c: no editmode (violated already :), tools operating on meshes
*/
@@ -221,8 +226,9 @@ int join_mesh_exec(bContext *C, wmOperator *op)
}
if(b==totcol) {
matar[b]= ma;
- if(ma)
- ma->id.us++;
+ if(ma) {
+ id_us_plus(&ma->id);
+ }
totcol++;
}
if(totcol>=MAXMAT-1)
@@ -1055,7 +1061,7 @@ long mesh_mirrtopo_table(Object *ob, char mode)
return 0;
}
-int mesh_get_x_mirror_vert_spacial(Object *ob, int index)
+static int mesh_get_x_mirror_vert_spacial(Object *ob, int index)
{
Mesh *me= ob->data;
MVert *mvert;