Commit: 670aea50299f7f756cad21e29117874b2f8eb116
Author: Bastien Montagne
Date: Wed Nov 8 12:07:46 2017 +0100
Branches: soc-2017-normal-tools
https://developer.blender.org/rB670aea50299f7f756cad21e29117874b2f8eb116
Merge branch 'master' into soc-2017-normal-tools
Conflicts:
source/blender/makesrna/intern/rna_scene.c
===================================================================
===================================================================
diff --cc source/blender/bmesh/bmesh_class.h
index b080c634cdf,bec2c7a1f45..84b52570297
--- a/source/blender/bmesh/bmesh_class.h
+++ b/source/blender/bmesh/bmesh_class.h
@@@ -368,13 -341,10 +368,13 @@@ enum
/* spare tag, assumed dirty, use define in each function to name based
on use */
// _BM_ELEM_TAG_ALT = (1 << 6), // UNUSED
/**
- * for low level internal API tagging,
- * since tools may want to tag verts and
- * not have functions clobber them */
+ * For low level internal API tagging,
+ * since tools may want to tag verts and not have functions clobber
them.
+ * Leave cleared! */
BM_ELEM_INTERNAL_TAG = (1 << 7),
+
+ /* Space invalid when set. */
+ BM_ELEM_LNORSPACE = (1 << 6)
};
struct BPy_BMGeneric;
diff --cc source/blender/makesrna/intern/rna_scene.c
index 28d34d352c2,bc56ff251e8..5c2e0670ee5
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@@ -2489,14 -2489,7 +2489,14 @@@ static void rna_def_tool_settings(Blend
{0, NULL, 0, NULL, NULL}
};
+ static EnumPropertyItem mod_weighted_strength[] = {
+ {FACE_STRENGTH_WEAK, "Weak", 0, "Weak", ""},
+ {FACE_STRENGTH_MEDIUM, "Medium", 0, "Medium", ""},
+ {FACE_STRENGTH_STRONG, "Strong", 0, "Strong", ""},
+ {0, NULL, 0, NULL, NULL},
+ };
+
- static EnumPropertyItem draw_groupuser_items[] = {
+ static const EnumPropertyItem draw_groupuser_items[] = {
{OB_DRAW_GROUPUSER_NONE, "NONE", 0, "None", ""},
{OB_DRAW_GROUPUSER_ACTIVE, "ACTIVE", 0, "Active", "Show
vertices with no weights in the active group"},
{OB_DRAW_GROUPUSER_ALL, "ALL", 0, "All", "Show vertices with no
weights in any group"},
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
