Merged changes in the trunk up to revision 54992.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 3 Mar 2013 15:07:49 +0000 (15:07 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 3 Mar 2013 15:07:49 +0000 (15:07 +0000)
Resolved conflicts:
release/scripts/startup/bl_ui/space_view3d.py

20 files changed:
1  2 
CMakeLists.txt
SConstruct
intern/cycles/blender/addon/ui.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c
source/blender/render/CMakeLists.txt
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge
diff --cc SConstruct
Simple merge
Simple merge
index aafa4f1fe062871cf5547c7babbe7f898f46088b,37f7cf65403c73621fc66509e1a1b659bbed8a3a..a8be8b214982e9e606a9e90d79a867349905b14e
@@@ -2497,17 -2519,21 +2531,25 @@@ class VIEW3D_PT_view3d_meshdisplay(Pane
  
          mesh = context.active_object.data
  
-         col = layout.column()
+         split = layout.split()
+         
+         col = split.column()
          col.label(text="Overlays:")
-         col.prop(mesh, "show_edges", text="Edges")
          col.prop(mesh, "show_faces", text="Faces")
+         col.prop(mesh, "show_edges", text="Edges")
          col.prop(mesh, "show_edge_crease", text="Creases")
-         col.prop(mesh, "show_edge_bevel_weight", text="Bevel Weights")
+         
+         col = split.column()
+         col.label()
          col.prop(mesh, "show_edge_seams", text="Seams")
          col.prop(mesh, "show_edge_sharp", text="Sharp")
+         col.prop(mesh, "show_edge_bevel_weight", text="Weights")
+         
 +        if context.scene and bpy.app.build_options.freestyle:
 +            col.prop(mesh, "show_freestyle_edge_marks", text="Freestyle Edge Marks")
 +            col.prop(mesh, "show_freestyle_face_marks", text="Freestyle Face Marks")
++        
+         col = layout.column()
  
          col.separator()
          col.label(text="Normals:")
Simple merge
Simple merge