soc-2008-mxcurioni: merged changes to revision 14967
authorMaxime Curioni <maxime.curioni@gmail.com>
Sun, 25 May 2008 18:28:52 +0000 (18:28 +0000)
committerMaxime Curioni <maxime.curioni@gmail.com>
Sun, 25 May 2008 18:28:52 +0000 (18:28 +0000)
30 files changed:
1  2 
release/scripts/flt_export.py
release/scripts/flt_import.py
release/scripts/uvcalc_lightmap.py
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/mball.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle.c
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/intern/SConscript
source/blender/python/api2_2x/Node.c
source/blender/python/api2_2x/sceneRender.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/rayshade.c
source/blender/render/intern/source/rendercore.c
source/blender/src/buttons_editing.c
source/blender/src/buttons_object.c
source/blender/src/buttons_scene.c
source/blender/src/buttons_shading.c
source/blender/src/drawimage.c
source/blender/src/drawobject.c
source/blender/src/editmesh_lib.c
source/blender/src/editseq.c
source/blender/src/filesel.c
source/blender/src/header_image.c
source/blender/src/renderwin.c
source/blender/src/sequence.c
source/blender/src/space.c
source/blender/src/usiblender.c

Simple merge
Simple merge
Simple merge
Simple merge
index 94a715162a08312e72a3f4ddfcb61e984b332247,592a8c1b7aa43b3f05ffbb9b41e9f0609f0c5b26..91c7b2b44a8c9a2c684134190787d7ff4e5358d9
@@@ -5070,9 -5081,7 +5070,7 @@@ static void editing_panel_mesh_tools1(O
        
        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");
 +      uiDefButC(block, MENU, REDRAWBUTSEDIT, "Edge Alt-Select Mode%t|Loop Select%x0|Tag Edges (Seam)%x1|Tag Edges (Sharp)%x2|Tag Edges (Sharp)%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);
        uiDefButBitI(block, TOG, G_ALLEDGES, 0, "All Edges",                    1125, 22,150,19, &G.f, 0, 0, 0, 0, "Displays all edges in object mode without optimization");
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge