[Bf-blender-cvs] [251dbabdf13] soc-2018-npr: Fixed enum in modifier IDs (npr tess modifier and a merged new one)

[Nick Wu]

Commit: 251dbabdf13bccae2264bffdc13b0f9133eccaa8
Author: Nick Wu
Date:   Fri Aug 10 16:18:31 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB251dbabdf13bccae2264bffdc13b0f9133eccaa8

Fixed enum in modifier IDs (npr tess modifier and a merged new one)

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

M	release/scripts/addons
M	source/blender/editors/mesh/editmesh_tools.c
M	source/blender/makesdna/DNA_modifier_types.h

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

diff --git a/release/scripts/addons b/release/scripts/addons
index 1a5f14657ee..c88411ff777 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 1a5f14657ee06ec2f520326032305dc1f2c5e2d5
+Subproject commit c88411ff7776a2db5d6ef6117a1b2faa42a95611
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 9ed1a376edb..f09623d2f28 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -6918,7 +6918,7 @@ void MESH_OT_mark_freestyle_face(wmOperatorType *ot)
 
 /** \} */
 
-#endif  /* WITH_FREESTYLE */
+//#endif  /* WITH_FREESTYLE */
 
 /********************** Loop normals editing tools modal map. **********************/
 
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index f4939d87c2e..b7fc26771b4 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -91,7 +91,7 @@ typedef enum ModifierType {
 	eModifierType_MeshSequenceCache = 52,
 	eModifierType_SurfaceDeform     = 53,
 	eModifierType_WeightedNormal	= 54,
-	eModifierType_MyBMesh           = 54,
+	eModifierType_MyBMesh           = 55,
 	NUM_MODIFIER_TYPES
 } ModifierType;