diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-12-03 15:30:59 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-03 15:30:59 +0300 |
commit | cd972535027a73ba70069051fe9038b6a8b5696a (patch) | |
tree | b50696bddbc710192b89e34fcdd1e82e6c8073b7 /source/blender/editors/mesh | |
parent | aca76ddb502cbf0ee7888c3356f9f35240919410 (diff) |
- added GCC warning -Wstrict-prototypes
- fixed bug in paste material, exposed by stricter warnings.
- removed/renamed various shadowed vars.
- removed BGE lamp.colour, only allow lamp.color attribute.
Diffstat (limited to 'source/blender/editors/mesh')
-rw-r--r-- | source/blender/editors/mesh/editmesh.c | 8 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_loop.c | 4 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_mods.c | 5 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 10 | ||||
-rw-r--r-- | source/blender/editors/mesh/meshtools.c | 1 |
5 files changed, 12 insertions, 16 deletions
diff --git a/source/blender/editors/mesh/editmesh.c b/source/blender/editors/mesh/editmesh.c index 424b3c5467f..99b3d4e64ab 100644 --- a/source/blender/editors/mesh/editmesh.c +++ b/source/blender/editors/mesh/editmesh.c @@ -918,9 +918,9 @@ void make_editMesh(Scene *scene, Object *ob) } /* makes Mesh out of editmesh */ -void load_editMesh(Scene *scene, Object *ob) +void load_editMesh(Scene *scene, Object *obedit) { - Mesh *me= ob->data; + Mesh *me= obedit->data; MVert *mvert, *oldverts; MEdge *medge; MFace *mface; @@ -1110,7 +1110,7 @@ void load_editMesh(Scene *scene, Object *ob) Object *ob; ModifierData *md; EditVert **vertMap = NULL; - int i,j; + int j; for (ob=G.main->object.first; ob; ob=ob->id.next) { if (ob->parent==ob && ELEM(ob->partype, PARVERT1,PARVERT3)) { @@ -1310,7 +1310,7 @@ void load_editMesh(Scene *scene, Object *ob) mesh_calc_normals(me->mvert, me->totvert, me->mface, me->totface, NULL); /* topology could be changed, ensure mdisps are ok */ - multires_topology_changed(ob); + multires_topology_changed(obedit); } void remake_editMesh(Scene *scene, Object *ob) diff --git a/source/blender/editors/mesh/editmesh_loop.c b/source/blender/editors/mesh/editmesh_loop.c index 2e095af9c03..70fcca097ef 100644 --- a/source/blender/editors/mesh/editmesh_loop.c +++ b/source/blender/editors/mesh/editmesh_loop.c @@ -70,9 +70,9 @@ editmesh_loop: tools with own drawing subloops, select, knife, subdiv /* **** XXX ******** */ static void BIF_undo_push(const char *UNUSED(arg)) {} -static void BIF_undo() {} +static void BIF_undo(void) {} static void error(const char *UNUSED(arg)) {} -static int qtest() {return 0;} +static int qtest(void) {return 0;} /* **** XXX ******** */ diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c index c9934275f3f..af03df34d5c 100644 --- a/source/blender/editors/mesh/editmesh_mods.c +++ b/source/blender/editors/mesh/editmesh_mods.c @@ -35,12 +35,10 @@ editmesh_mods.c, UI level access, no geometry changes #include <stdlib.h> #include <string.h> -#include <math.h> #include "MEM_guardedalloc.h" - #include "DNA_material_types.h" #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" @@ -139,14 +137,13 @@ void EM_automerge(Scene *scene, Object *obedit, int update) (obedit && obedit->type==OB_MESH && (obedit->mode & OB_MODE_EDIT)) && (me->mr==NULL) ) { - Mesh *me= (Mesh*)obedit->data; EditMesh *em= me->edit_mesh; len = removedoublesflag(em, 1, 1, scene->toolsettings->doublimit); if (len) { em->totvert -= len; /* saves doing a countall */ if (update) { - DAG_id_flush_update(obedit->data, OB_RECALC_DATA); + DAG_id_flush_update(&me->id, OB_RECALC_DATA); } } } diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 2a04859f462..8adf504b7fd 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -3554,7 +3554,7 @@ static const EnumPropertyItem direction_items[]= { #define AXIS_X 1 #define AXIS_Y 2 -static const EnumPropertyItem axis_items[]= { +static const EnumPropertyItem axis_items_xy[]= { {AXIS_X, "X", 0, "X", ""}, {AXIS_Y, "Y", 0, "Y", ""}, {0, NULL, 0, NULL, NULL}}; @@ -6701,7 +6701,7 @@ void MESH_OT_uvs_mirror(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_enum(ot->srna, "axis", axis_items, DIRECTION_CW, "Axis", "Axis to mirror UVs around."); + RNA_def_enum(ot->srna, "axis", axis_items_xy, DIRECTION_CW, "Axis", "Axis to mirror UVs around."); } void MESH_OT_colors_rotate(wmOperatorType *ot) @@ -6737,7 +6737,7 @@ void MESH_OT_colors_mirror(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_enum(ot->srna, "axis", axis_items, DIRECTION_CW, "Axis", "Axis to mirror colors around."); + RNA_def_enum(ot->srna, "axis", axis_items_xy, DIRECTION_CW, "Axis", "Axis to mirror colors around."); } /********************** Subdivide Operator *************************/ @@ -7493,7 +7493,7 @@ void MESH_OT_select_axis(wmOperatorType *ot) {-1, "ALIGNED", 0, "Aligned Axis", ""}, {0, NULL, 0, NULL, NULL}}; - static EnumPropertyItem axis_items[] = { + static EnumPropertyItem axis_items_xyz[] = { {0, "X_AXIS", 0, "X Axis", ""}, {1, "Y_AXIS", 0, "Y Axis", ""}, {2, "Z_AXIS", 0, "Z Axis", ""}, @@ -7513,6 +7513,6 @@ void MESH_OT_select_axis(wmOperatorType *ot) /* properties */ RNA_def_enum(ot->srna, "mode", axis_mode_items, 0, "Axis Mode", "Axis side to use when selecting"); - RNA_def_enum(ot->srna, "axis", axis_items, 0, "Axis", "Select the axis to compare each vertex on"); + RNA_def_enum(ot->srna, "axis", axis_items_xyz, 0, "Axis", "Select the axis to compare each vertex on"); } diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index b7c4011c538..820e287e945 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -33,7 +33,6 @@ #include <stddef.h> #include <stdlib.h> -#include <string.h> #include <math.h> #include <float.h> |