Merged changes in the trunk up to revision 55700.

Conflicts resolved:
source/blender/editors/mesh/mesh_intern.h

diff --cc CMakeLists.txt
Simple merge

diff --cc build_files/scons/config/win32-mingw-config.py
Simple merge

diff --cc build_files/scons/config/win32-vc-config.py
Simple merge

diff --cc build_files/scons/config/win64-mingw-config.py
Simple merge

diff --cc build_files/scons/config/win64-vc-config.py
Simple merge

diff --cc intern/cycles/blender/addon/ui.py
index 0d1437e13e4674d644ccce500a53ee37e66acc75,4c3061e13a9342b97ba24e4a3684f8b9032b62e7..ee33bf6572a1561d3a2452bc478a67c8044e8c5c
--- 1/intern/cycles/blender/addon/ui.py
--- 2/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@@ -240,13 -240,12 +240,13 @@@ class CyclesRender_PT_opengl(CyclesButt
          col = split.column()
          col.label(text="Alpha:")
          col.prop(rd, "alpha_mode", text="")
-         
-         
+ 
+ 
  class CyclesRender_PT_layers(CyclesButtonsPanel, Panel):
      bl_label = "Layers"
 -    bl_options = {'DEFAULT_CLOSED'}
 -    COMPAT_ENGINES = {'BLENDER_RENDER'}
 +    bl_options = {'HIDE_HEADER'}
 +    bl_context = "render_layer"
 +    COMPAT_ENGINES = {'CYCLES'}
  
      def draw(self, context):
          layout = self.layout

diff --cc release/scripts/startup/bl_ui/properties_render.py
Simple merge

diff --cc release/scripts/startup/bl_ui/space_view3d.py
index e474117f0d4483f1e24628ed2b5d86969bd74d68,a82d92211669bcf49e13094f564078eb1b0358be..8f65eb5b72682ff1b980f99282b644237a97a313
--- 1/release/scripts/startup/bl_ui/space_view3d.py
--- 2/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -2559,14 -2542,10 +2558,14 @@@ class VIEW3D_PT_view3d_meshdisplay(Pane
  
          col = split.column()
          col.label()
 -        col.prop(mesh, "show_edge_seams", text="Seams")
 +        if not with_freestyle:
 +            col.prop(mesh, "show_edge_seams", text="Seams")
-         col.prop(mesh, "show_edge_sharp", text="Sharp")
+         col.prop(mesh, "show_edge_sharp", text="Sharp", text_ctxt=i18n_contexts.plural)
          col.prop(mesh, "show_edge_bevel_weight", text="Weights")
 -
 +        if with_freestyle:
 +            col.prop(mesh, "show_freestyle_edge_marks", text="Edge Marks")
 +            col.prop(mesh, "show_freestyle_face_marks", text="Face Marks")
 +        
          col = layout.column()
  
          col.separator()

diff --cc source/blender/blenfont/BLF_translation.h
Simple merge

diff --cc source/blender/blenloader/intern/readfile.c
Simple merge

diff --cc source/blender/blenloader/intern/writefile.c
Simple merge

diff --cc source/blender/editors/animation/anim_channels_defines.c
Simple merge

diff --cc source/blender/editors/include/ED_anim_api.h
Simple merge

diff --cc source/blender/editors/include/UI_resources.h
Simple merge

diff --cc source/blender/editors/interface/resources.c
Simple merge

diff --cc source/blender/editors/mesh/CMakeLists.txt
Simple merge

diff --cc source/blender/editors/mesh/editmesh_select.c
Simple merge

diff --cc source/blender/editors/mesh/editmesh_tools.c
index f05df06ffa2c8c81f4151db744dc48c35563c855,c4763e7532792bf8578ee47c71817fd9199b8d4f..5befcd7b5f2da33461f5dbeb274184a8b1f342c8
--- 1/source/blender/editors/mesh/editmesh_tools.c
--- 2/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@@ -34,12 -34,10 +34,11 @@@
  #include "DNA_key_types.h"
  #include "DNA_material_types.h"
  #include "DNA_mesh_types.h"
 +#include "DNA_meshdata_types.h"
  #include "DNA_modifier_types.h"
  #include "DNA_object_types.h"
- #include "DNA_scene_types.h"
  
- #include "BLI_blenlib.h"
+ #include "BLI_listbase.h"
  #include "BLI_noise.h"
  #include "BLI_math.h"
  #include "BLI_rand.h"

diff --cc source/blender/editors/mesh/mesh_intern.h
index 89a320ca92820aa4103343042461a50d790562ac,996ee9fc549c3d52b70905bfcd40b1de3870d112..4a0bbbb8dbf9629907a4794d42b1afe3895a00ae
--- 1/source/blender/editors/mesh/mesh_intern.h
--- 2/source/blender/editors/mesh/mesh_intern.h
+++ b/source/blender/editors/mesh/mesh_intern.h
@@@ -178,18 -179,32 +179,36 @@@ void MESH_OT_colors_reverse(struct wmOp
  void MESH_OT_delete(struct wmOperatorType *ot);
  void MESH_OT_edge_collapse(struct wmOperatorType *ot);
  void MESH_OT_edge_collapse_loop(struct wmOperatorType *ot);
- void MESH_OT_rip(struct wmOperatorType *ot);
+ void MESH_OT_faces_shade_smooth(struct wmOperatorType *ot);
+ void MESH_OT_faces_shade_flat(struct wmOperatorType *ot);
+ void MESH_OT_split(struct wmOperatorType *ot);
+ void MESH_OT_edge_rotate(struct wmOperatorType *ot);
+ void MESH_OT_hide(struct wmOperatorType *ot);
+ void MESH_OT_reveal(struct wmOperatorType *ot);
+ void MESH_OT_mark_seam(struct wmOperatorType *ot);
+ void MESH_OT_mark_sharp(struct wmOperatorType *ot);
+ void MESH_OT_noise(struct wmOperatorType *ot);
+ void MESH_OT_flip_normals(struct wmOperatorType *ot);
+ void MESH_OT_solidify(struct wmOperatorType *ot);
+ void MESH_OT_knife_cut(struct wmOperatorType *ot);
+ void MESH_OT_separate(struct wmOperatorType *ot);
+ void MESH_OT_fill(struct wmOperatorType *ot);
+ void MESH_OT_beautify_fill(struct wmOperatorType *ot);
+ void MESH_OT_quads_convert_to_tris(struct wmOperatorType *ot);
+ void MESH_OT_tris_convert_to_quads(struct wmOperatorType *ot);
+ void MESH_OT_dissolve(struct wmOperatorType *ot);
+ void MESH_OT_dissolve_limited(struct wmOperatorType *ot);
+ void MESH_OT_edge_face_add(struct wmOperatorType *ot);
+ void MESH_OT_duplicate(struct wmOperatorType *ot);
+ void MESH_OT_merge(struct wmOperatorType *ot);
+ void MESH_OT_remove_doubles(struct wmOperatorType *ot);
  
- void MESH_OT_shape_propagate_to_all(struct wmOperatorType *ot);
- void MESH_OT_blend_from_shape(struct wmOperatorType *ot);
- void MESH_OT_sort_elements(struct wmOperatorType *ot);
 +#ifdef WITH_FREESTYLE
++void MESH_OT_mark_freestyle_edge(struct wmOperatorType *ot);
 +void MESH_OT_mark_freestyle_face(struct wmOperatorType *ot);
 +#endif
  
- /* ******************* mesh_data.c */
- 
+ /* *** mesh_data.c *** */
  void MESH_OT_uv_texture_add(struct wmOperatorType *ot);
  void MESH_OT_uv_texture_remove(struct wmOperatorType *ot);
  void MESH_OT_vertex_color_add(struct wmOperatorType *ot);

diff --cc source/blender/editors/mesh/mesh_ops.c
Simple merge

diff --cc source/blender/editors/space_view3d/drawobject.c
Simple merge

diff --cc source/blender/makesdna/DNA_ID.h
Simple merge

diff --cc source/blender/makesdna/DNA_mesh_types.h
index df8b423fcad83adb50137f00171066acbc0cde1d,87f45c28ed9da25a5af2daebb5a612f3d40ad6a2..85bb58a2017d6669bce3fa078ff2bfc01d513f08
--- 1/source/blender/makesdna/DNA_mesh_types.h
--- 2/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@@ -199,13 -197,11 +199,14 @@@ typedef struct TFace 
  #define ME_DRAWEXTRA_EDGELEN  (1 << 10)
  #define ME_DRAWEXTRA_FACEAREA (1 << 11)
  #define ME_DRAWEXTRA_FACEANG  (1 << 12)
+ #define ME_DRAWEXTRA_EDGEANG  (1 << 13)
  
  /* debug only option */
- #define ME_DRAWEXTRA_INDICES (1 << 13)
+ #define ME_DRAWEXTRA_INDICES (1 << 14)
  
 +#define ME_DRAW_FREESTYLE_EDGE (1 << 14)
 +#define ME_DRAW_FREESTYLE_FACE (1 << 15)
 +
  /* Subsurf Type */
  #define ME_CC_SUBSURF                 0
  #define ME_SIMPLE_SUBSURF     1

diff --cc source/blender/makesdna/DNA_space_types.h
Simple merge

diff --cc source/blender/makesdna/DNA_userdef_types.h
Simple merge

diff --cc source/blender/makesrna/intern/makesrna.c
Simple merge

diff --cc source/blender/makesrna/intern/rna_mesh.c
Simple merge

diff --cc source/blender/makesrna/intern/rna_userdef.c
Simple merge

diff --cc source/blender/render/intern/source/pipeline.c
Simple merge

diff --cc source/creator/CMakeLists.txt
Simple merge