[Bf-blender-cvs] [026ba72bffe] temp-fracture-modifier-2.8: Merge branch 'blender2.8' into fracture_modifier-2.8
Martin Felke
noreply at git.blender.org
Fri Aug 10 14:00:58 CEST 2018
Commit: 026ba72bffe48d3ba6104b000b267015fcbc80f7
Author: Martin Felke
Date: Thu Aug 9 23:58:58 2018 +0200
Branches: temp-fracture-modifier-2.8
https://developer.blender.org/rB026ba72bffe48d3ba6104b000b267015fcbc80f7
Merge branch 'blender2.8' into fracture_modifier-2.8
Conflicts:
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_util.c
source/tools
===================================================================
===================================================================
diff --cc source/blender/makesdna/DNA_modifier_types.h
index 2b54575a827,02e70a323c7..914ef2dd4e3
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@@ -90,7 -90,7 +90,8 @@@ typedef enum ModifierType
eModifierType_CorrectiveSmooth = 51,
eModifierType_MeshSequenceCache = 52,
eModifierType_SurfaceDeform = 53,
- eModifierType_Fracture = 54,
+ eModifierType_WeightedNormal = 54,
++ eModifierType_Fracture = 55,
NUM_MODIFIER_TYPES
} ModifierType;
diff --cc source/blender/makesrna/intern/rna_modifier.c
index a35dd8ef6e5,f0898064860..2a64e43c694
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@@ -415,8 -415,8 +416,10 @@@ static StructRNA *rna_Modifier_refine(s
return &RNA_MeshSequenceCacheModifier;
case eModifierType_SurfaceDeform:
return &RNA_SurfaceDeformModifier;
+ case eModifierType_WeightedNormal:
+ return &RNA_WeightedNormalModifier;
+ case eModifierType_Fracture:
+ return &RNA_FractureModifier;
/* Default */
case eModifierType_None:
case eModifierType_ShapeKey:
diff --cc source/blender/modifiers/MOD_modifiertypes.h
index 14253c304cc,3511b0edbec..55a470468e5
--- a/source/blender/modifiers/MOD_modifiertypes.h
+++ b/source/blender/modifiers/MOD_modifiertypes.h
@@@ -86,7 -86,7 +86,8 @@@ extern ModifierTypeInfo modifierType_No
extern ModifierTypeInfo modifierType_CorrectiveSmooth;
extern ModifierTypeInfo modifierType_MeshSequenceCache;
extern ModifierTypeInfo modifierType_SurfaceDeform;
+ extern ModifierTypeInfo modifierType_WeightedNormal;
+extern ModifierTypeInfo modifierType_Fracture;
/* MOD_util.c */
void modifier_type_init(ModifierTypeInfo *types[]);
diff --cc source/blender/modifiers/intern/MOD_util.c
index f524111ae9b,721474a62f3..7899b771929
--- a/source/blender/modifiers/intern/MOD_util.c
+++ b/source/blender/modifiers/intern/MOD_util.c
@@@ -290,6 -290,6 +290,7 @@@ void modifier_type_init(ModifierTypeInf
INIT_TYPE(CorrectiveSmooth);
INIT_TYPE(MeshSequenceCache);
INIT_TYPE(SurfaceDeform);
+ INIT_TYPE(WeightedNormal);
+ INIT_TYPE(Fracture);
#undef INIT_TYPE
}
More information about the Bf-blender-cvs
mailing list