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

Jacques Lucke noreply at git.blender.org
Thu Dec 12 11:19:09 CET 2019


Commit: ee52b2f7d8dde3e9ed56925776d7ad2551388ca0
Author: Jacques Lucke
Date:   Thu Dec 12 11:17:04 2019 +0100
Branches: functions
https://developer.blender.org/rBee52b2f7d8dde3e9ed56925776d7ad2551388ca0

Merge branch 'master' into functions

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



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

diff --cc source/blender/makesdna/DNA_modifier_types.h
index 75a860de053,0ed9a7f3e5e..1c986c3c260
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@@ -86,11 -86,8 +86,12 @@@ typedef enum ModifierType 
    eModifierType_MeshSequenceCache = 52,
    eModifierType_SurfaceDeform = 53,
    eModifierType_WeightedNormal = 54,
-   eModifierType_FunctionDeform = 55,
+   eModifierType_Weld = 55,
 +  eModifierType_FunctionPoints = 56,
 +  eModifierType_BParticles = 57,
 +  eModifierType_BParticlesOutput = 58,
-   NUM_MODIFIER_TYPES
++  eModifierType_FunctionDeform = 59,
+   NUM_MODIFIER_TYPES,
  } ModifierType;
  
  typedef enum ModifierMode {
diff --cc source/blender/makesrna/intern/rna_modifier.c
index ca4ca07fe73,3bb8be38682..7c9ac6a2072
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@@ -187,7 -187,11 +187,12 @@@ const EnumPropertyItem rna_enum_object_
       ICON_MOD_WIREFRAME,
       "Wireframe",
       "Convert faces into thickened edges"},
+     {eModifierType_Weld,
+      "WELD",
+      ICON_AUTOMERGE_OFF,
+      "Weld",
+      "Finds groups of vertices closer then dist and merges them together"},
 +    {eModifierType_FunctionPoints, "FUNCTION_POINTS", ICON_NONE, "Function Points", ""},
      {0, "", 0, N_("Deform"), ""},
      {eModifierType_Armature,
       "ARMATURE",



More information about the Bf-blender-cvs mailing list