[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30262] trunk/blender/source/blender/ editors/mesh/editmesh_tools.c: Fix #22804: own mistake, remove doubles shouldn't get cancelled if no

[Brecht Van Lommel]

Revision: 30262
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30262
Author:   blendix
Date:     2010-07-13 12:45:40 +0200 (Tue, 13 Jul 2010)

Log Message:
-----------
Fix #22804: own mistake, remove doubles shouldn't get cancelled if no
vertices are merged, but finish so the threshold can be tweaked.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mesh/editmesh_tools.c

Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c  2010-07-13 
10:29:41 UTC (rev 30261)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c  2010-07-13 
10:45:40 UTC (rev 30262)
@@ -485,17 +485,16 @@
 
        int count = removedoublesflag(em,1,0,RNA_float_get(op->ptr, "limit"));
        
-       if(!count)
-               return OPERATOR_CANCELLED;
+       if(count) {
+               recalc_editnormals(em);
 
-       recalc_editnormals(em);
+               DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
+               WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
+       }
 
        BKE_reportf(op->reports, RPT_INFO, "Removed %d vertices", count);
-
-       DAG_id_flush_update(obedit->data, OB_RECALC_DATA);
-       WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
-
        BKE_mesh_end_editmesh(obedit->data, em);
+
        return OPERATOR_FINISHED;
 }
 


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs