[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14820] branches/apricot/source/blender/ src/buttons_editing.c: fix for error when resolving conflicts

Campbell Barton ideasman42 at gmail.com
Mon May 12 23:19:24 CEST 2008


Revision: 14820
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14820
Author:   campbellbarton
Date:     2008-05-12 23:19:24 +0200 (Mon, 12 May 2008)

Log Message:
-----------
fix for error when resolving conflicts

Modified Paths:
--------------
    branches/apricot/source/blender/src/buttons_editing.c

Modified: branches/apricot/source/blender/src/buttons_editing.c
===================================================================
--- branches/apricot/source/blender/src/buttons_editing.c	2008-05-12 21:12:10 UTC (rev 14819)
+++ branches/apricot/source/blender/src/buttons_editing.c	2008-05-12 21:19:24 UTC (rev 14820)
@@ -5081,8 +5081,6 @@
 	
 	uiBlockEndAlign(block);
 	
-	uiDefButBitS(block, TOG, B_MESH_X_MIRROR, B_DIFF, "X-axis mirror",1125,0,150,19, &G.scene->toolsettings->editbutflag, 0, 0, 0, 0, "While using transforms, mirrors the transformation");
-	
 	uiDefButC(block, MENU, REDRAWBUTSEDIT, "Edge Alt-Select Mode%t|Loop Select%x0|Tag Edges (Seam)%x1|Tag Edges (Sharp)%x2|Tag Edges (Crease)%x3|Tag Edges (Bevel)%x4",1125,88,150,19, &G.scene->toolsettings->edge_mode, 0, 0, 0, 0, "Operation to use when Alt+RMB on edges, Use Alt+Shift+RMB to tag the shortest path from the active edge");
 	
 	uiBlockBeginAlign(block);





More information about the Bf-blender-cvs mailing list