[Bf-blender-cvs] [9503e34e991] soc-2021-porting-modifiers-to-nodes-merge-by-distance: Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-merge-by-distance

[Fabian Schempp]

Commit: 9503e34e9917da0e29d4e58a91782c932ab9ed20
Author: Fabian Schempp
Date:   Sat Jul 24 11:41:37 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-merge-by-distance
https://developer.blender.org/rB9503e34e9917da0e29d4e58a91782c932ab9ed20

Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-merge-by-distance

# Conflicts:
#	source/blender/modifiers/intern/MOD_weld.c

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



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

diff --cc source/blender/makesdna/DNA_modifier_types.h
index df90f5dbd81,99c346bf589..de24b7eace0
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@@ -2023,8 -2023,15 +2023,9 @@@ typedef struct WeldModifierData 
  /* WeldModifierData->flag */
  enum {
    MOD_WELD_INVERT_VGROUP = (1 << 0),
+   MOD_WELD_LOOSE_EDGES = (1 << 1),
  };
  
 -/* #WeldModifierData.mode */
 -enum {
 -  MOD_WELD_MODE_ALL = 0,
 -  MOD_WELD_MODE_CONNECTED = 1,
 -};
 -
  typedef struct DataTransferModifierData {
    ModifierData modifier;