[Bf-blender-cvs] [3fe710aeafd] functions: Merge branch 'master' into functions

[Jacques Lucke]

Commit: 3fe710aeafd4199afc4bfdbab810df00a079c0fa
Author: Jacques Lucke
Date:   Wed Feb 19 10:17:36 2020 +0100
Branches: functions
https://developer.blender.org/rB3fe710aeafd4199afc4bfdbab810df00a079c0fa

Merge branch 'master' into functions

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



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

diff --cc source/blender/makesrna/intern/rna_modifier.c
index 571ad6faf01,9a4048e6aaa..4f0ea82a9ca
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@@ -191,8 -186,12 +186,13 @@@ const EnumPropertyItem rna_enum_object_
       "WELD",
       ICON_AUTOMERGE_OFF,
       "Weld",
-      "Finds groups of vertices closer then dist and merges them together"},
+      "Find groups of vertices closer then dist and merges them together"},
 +    {eModifierType_FunctionPoints, "FUNCTION_POINTS", ICON_NONE, "Function Points", ""},
+     {eModifierType_Wireframe,
+      "WIREFRAME",
+      ICON_MOD_WIREFRAME,
+      "Wireframe",
+      "Convert faces into thickened edges"},
      {0, "", 0, N_("Deform"), ""},
      {eModifierType_Armature,
       "ARMATURE",