Commit: 40407509d4b8b0312c69a3f38a5cc4b3070025f2
Author: Bastien Montagne
Date:   Fri Feb 2 15:14:03 2018 +0100
Branches: soc-2017-normal-tools
https://developer.blender.org/rB40407509d4b8b0312c69a3f38a5cc4b3070025f2

Merge branch 'master' into soc-2017-normal-tools

Conflicts:
        release/datafiles/locale
        release/scripts/addons
        release/scripts/addons_contrib
        source/blender/makesdna/DNA_scene_types.h
        source/tools

===================================================================



===================================================================

diff --cc source/blender/makesdna/DNA_scene_types.h
index 8d06bc96a8a,1cc5cbf8c42..6ebc06a6c33
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@@ -2022,15 -2029,8 +2033,15 @@@ enum 
        OB_DRAW_GROUPUSER_ALL       = 2
  };
  
 +/* toolsettings->face_strength */
 +enum {
 +      FACE_STRENGTH_WEAK = 1,
 +      FACE_STRENGTH_MEDIUM = 0,
 +      FACE_STRENGTH_STRONG = 2,
 +};
 +
- /* toolsettings->vgroupsubset */
  /* object_vgroup.c */
+ /* ToolSettings.vgroupsubset */
  typedef enum eVGroupSelect {
        WT_VGROUP_ALL = 0,
        WT_VGROUP_ACTIVE = 1,

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to