Merge branch 'blender2.8' into soc-2018-bevel
authorRohan Rathi <rohanrathi08@gmail.com>
Mon, 11 Jun 2018 15:33:07 +0000 (21:03 +0530)
committerRohan Rathi <rohanrathi08@gmail.com>
Mon, 11 Jun 2018 15:33:07 +0000 (21:03 +0530)
24 files changed:
1  2 
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/space_view3d.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/intern/mesh_evaluate.c
source/blender/bmesh/bmesh_class.h
source/blender/bmesh/intern/bmesh_mesh.c
source/blender/bmesh/tools/bmesh_bevel.c
source/blender/draw/intern/draw_cache_impl_mesh.c
source/blender/editors/include/ED_screen.h
source/blender/editors/mesh/editmesh_bevel.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/mesh_intern.h
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_ops.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_util.c

Simple merge
Simple merge
@@@ -151,10 -150,8 +151,10 @@@ typedef struct BoundVert 
        Profile profile;    /* edge profile between this and next BoundVert */
        bool any_seam;      /* are any of the edges attached here seams? */
        bool visited;       /* used during delta adjust pass */
 +      int add_seam;
 +      int sharp_len;
  //    int _pad;
- } BoundVert;  
+ } BoundVert;
  
  /* Mesh structure replacing a vertex */
  typedef struct VMesh {
Simple merge