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

[Jacques Lucke]

Commit: e1e1dad6681a924b9351bfe278af7131410ceb09
Author: Jacques Lucke
Date:   Thu Dec 5 20:00:52 2019 +0100
Branches: functions
https://developer.blender.org/rBe1e1dad6681a924b9351bfe278af7131410ceb09

Merge branch 'master' into functions

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



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

diff --cc source/blender/makesrna/intern/rna_modifier.c
index 7ddc32ea56e,1c5b4618bf8..ca4ca07fe73
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@@ -104,14 -186,25 +186,26 @@@ const EnumPropertyItem rna_enum_object_
       "WIREFRAME",
       ICON_MOD_WIREFRAME,
       "Wireframe",
-      "Generate a wireframe on the edges of a mesh"},
+      "Convert faces into thickened edges"},
 +    {eModifierType_FunctionPoints, "FUNCTION_POINTS", ICON_NONE, "Function Points", ""},
      {0, "", 0, N_("Deform"), ""},
-     {eModifierType_Armature, "ARMATURE", ICON_MOD_ARMATURE, "Armature", ""},
-     {eModifierType_Cast, "CAST", ICON_MOD_CAST, "Cast", ""},
-     {eModifierType_Curve, "CURVE", ICON_MOD_CURVE, "Curve", ""},
-     {eModifierType_Displace, "DISPLACE", ICON_MOD_DISPLACE, "Displace", ""},
-     {eModifierType_Hook, "HOOK", ICON_HOOK, "Hook", ""},
+     {eModifierType_Armature,
+      "ARMATURE",
+      ICON_MOD_ARMATURE,
+      "Armature",
+      "Deform the shape using an armature object"},
+     {eModifierType_Cast,
+      "CAST",
+      ICON_MOD_CAST,
+      "Cast",
+      "Shift the shape towards a predefined primitive"},
+     {eModifierType_Curve, "CURVE", ICON_MOD_CURVE, "Curve", "Bend the mesh using a curve object"},
+     {eModifierType_Displace,
+      "DISPLACE",
+      ICON_MOD_DISPLACE,
+      "Displace",
+      "Offset vertices based on a texture"},
+     {eModifierType_Hook, "HOOK", ICON_HOOK, "Hook", "Deform specific points using another object"},
      {eModifierType_LaplacianDeform,
       "LAPLACIANDEFORM",
       ICON_MOD_MESHDEFORM,
@@@ -126,12 -239,28 +240,29 @@@
       "CORRECTIVE_SMOOTH",
       ICON_MOD_SMOOTH,
       "Smooth Corrective",
-      ""},
-     {eModifierType_LaplacianSmooth, "LAPLACIANSMOOTH", ICON_MOD_SMOOTH, "Smooth Laplacian", ""},
-     {eModifierType_SurfaceDeform, "SURFACE_DEFORM", ICON_MOD_MESHDEFORM, "Surface Deform", ""},
-     {eModifierType_Warp, "WARP", ICON_MOD_WARP, "Warp", ""},
-     {eModifierType_Wave, "WAVE", ICON_MOD_WAVE, "Wave", ""},
+      "Smooth the mesh while still preserving the volume"},
+     {eModifierType_LaplacianSmooth,
+      "LAPLACIANSMOOTH",
+      ICON_MOD_SMOOTH,
+      "Smooth Laplacian",
+      "Reduce the noise on a mesh surface with minimal changes to its shape"},
+     {eModifierType_SurfaceDeform,
+      "SURFACE_DEFORM",
+      ICON_MOD_MESHDEFORM,
+      "Surface Deform",
+      "Transfer motion from another mesh"},
+     {eModifierType_Warp,
+      "WARP",
+      ICON_MOD_WARP,
+      "Warp",
+      "Warp parts of a mesh to a new location in a very flexible way thanks to 2 specified "
+      "objects"},
+     {eModifierType_Wave,
+      "WAVE",
+      ICON_MOD_WAVE,
+      "Wave",
+      "Adds a ripple-like motion to an object’s geometry"},
 +    {eModifierType_FunctionDeform, "FUNCTION_DEFORM", ICON_NONE, "Function Deform", ""},
      {0, "", 0, N_("Simulate"), ""},
      {eModifierType_Cloth, "CLOTH", ICON_MOD_CLOTH, "Cloth", ""},
      {eModifierType_Collision, "COLLISION", ICON_MOD_PHYSICS, "Collision", ""},