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/editmesh_mods.c | |
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/editmesh_mods.c')
-rw-r--r-- | source/blender/editors/mesh/editmesh_mods.c | 5 |
1 files changed, 1 insertions, 4 deletions
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); } } } |