[Bf-blender-cvs] [53a56b7b6c1] blender2.8: Merge branch 'master' into blender2.8
Bastien Montagne
noreply at git.blender.org
Tue May 8 15:20:28 CEST 2018
Commit: 53a56b7b6c169b21df475ae94795208501581489
Author: Bastien Montagne
Date: Tue May 8 15:20:18 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB53a56b7b6c169b21df475ae94795208501581489
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/blenkernel/BKE_dynamicpaint.h
index 8f795bc7535,5bf9dd84702..a0814fc9183
--- a/source/blender/blenkernel/BKE_dynamicpaint.h
+++ b/source/blender/blenkernel/BKE_dynamicpaint.h
@@@ -62,10 -60,9 +62,10 @@@ typedef struct PaintWavePoint
short state;
} PaintWavePoint;
-struct DerivedMesh *dynamicPaint_Modifier_do(struct DynamicPaintModifierData *pmd, struct Scene *scene, struct Object *ob, struct DerivedMesh *dm);
+struct DerivedMesh *dynamicPaint_Modifier_do(struct DynamicPaintModifierData *pmd, struct Depsgraph *depsgraph, struct Scene *scene,
+ struct Object *ob, struct DerivedMesh *dm);
void dynamicPaint_Modifier_free(struct DynamicPaintModifierData *pmd);
- void dynamicPaint_Modifier_copy(struct DynamicPaintModifierData *pmd, struct DynamicPaintModifierData *tsmd);
+ void dynamicPaint_Modifier_copy(const struct DynamicPaintModifierData *pmd, struct DynamicPaintModifierData *tsmd);
bool dynamicPaint_createType(struct DynamicPaintModifierData *pmd, int type, struct Scene *scene);
struct DynamicPaintSurface *dynamicPaint_createNewSurface(struct DynamicPaintCanvasSettings *canvas, struct Scene *scene);
diff --cc source/blender/blenkernel/BKE_modifier.h
index 02337110289,f5c5b74a2ae..a3c6b84f267
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@@ -163,10 -160,9 +163,10 @@@ typedef struct ModifierTypeInfo
/* Copy instance data for this modifier type. Should copy all user
* level settings to the target modifier.
*/
- void (*copyData)(struct ModifierData *md, struct ModifierData *target);
+ void (*copyData)(const struct ModifierData *md, struct ModifierData *target);
- /********************* Deform modifier functions *********************/
+
+ /********************* Deform modifier functions *********************/ /* DEPRECATED */
/* Only for deform types, should apply the deformation
* to the given vertex array. If the deformer requires information from
diff --cc source/blender/modifiers/intern/MOD_array.c
index 01414a3dfad,0be5049012d..45678947df5
--- a/source/blender/modifiers/intern/MOD_array.c
+++ b/source/blender/modifiers/intern/MOD_array.c
@@@ -770,15 -811,7 +761,15 @@@ ModifierTypeInfo modifierType_Array =
eModifierTypeFlag_EnableInEditmode |
eModifierTypeFlag_AcceptsCVs,
- /* copyData */ copyData,
+ /* copyData */ modifier_copyData_generic,
+
+ /* deformVerts_DM */ NULL,
+ /* deformMatrices_DM */ NULL,
+ /* deformVertsEM_DM */ NULL,
+ /* deformMatricesEM_DM*/NULL,
+ /* applyModifier_DM */ NULL,
+ /* applyModifierEM_DM */NULL,
+
/* deformVerts */ NULL,
/* deformMatrices */ NULL,
/* deformVertsEM */ NULL,
diff --cc source/blender/modifiers/intern/MOD_bevel.c
index 7999a79bb08,bd37358011b..81a4e94386f
--- a/source/blender/modifiers/intern/MOD_bevel.c
+++ b/source/blender/modifiers/intern/MOD_bevel.c
@@@ -203,15 -185,7 +194,15 @@@ ModifierTypeInfo modifierType_Bevel =
eModifierTypeFlag_SupportsEditmode |
eModifierTypeFlag_EnableInEditmode,
- /* copyData */ copyData,
+ /* copyData */ modifier_copyData_generic,
+
+ /* deformVerts_DM */ NULL,
+ /* deformMatrices_DM */ NULL,
+ /* deformVertsEM_DM */ NULL,
+ /* deformMatricesEM_DM*/NULL,
+ /* applyModifier_DM */ NULL,
+ /* applyModifierEM_DM */NULL,
+
/* deformVerts */ NULL,
/* deformMatrices */ NULL,
/* deformVertsEM */ NULL,
diff --cc source/blender/modifiers/intern/MOD_boolean.c
index 5057f69bf23,1f683f52122..0da38979bdd
--- a/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@@@ -351,15 -357,7 +342,15 @@@ ModifierTypeInfo modifierType_Boolean
/* flags */ eModifierTypeFlag_AcceptsMesh |
eModifierTypeFlag_UsesPointCache,
- /* copyData */ copyData,
+ /* copyData */ modifier_copyData_generic,
+
+ /* deformVerts_DM */ NULL,
+ /* deformMatrices_DM */ NULL,
+ /* deformVertsEM_DM */ NULL,
+ /* deformMatricesEM_DM*/NULL,
+ /* applyModifier_DM */ applyModifier,
+ /* applyModifierEM_DM */NULL,
+
/* deformVerts */ NULL,
/* deformMatrices */ NULL,
/* deformVertsEM */ NULL,
diff --cc source/blender/modifiers/intern/MOD_build.c
index 048e9ce33c0,75afd7496a1..f9cd57cc460
--- a/source/blender/modifiers/intern/MOD_build.c
+++ b/source/blender/modifiers/intern/MOD_build.c
@@@ -313,15 -304,7 +304,16 @@@ ModifierTypeInfo modifierType_Build =
/* type */ eModifierTypeType_Nonconstructive,
/* flags */ eModifierTypeFlag_AcceptsMesh |
eModifierTypeFlag_AcceptsCVs,
- /* copyData */ copyData,
++
+ /* copyData */ modifier_copyData_generic,
+
+ /* deformVerts_DM */ NULL,
+ /* deformMatrices_DM */ NULL,
+ /* deformVertsEM_DM */ NULL,
+ /* deformMatricesEM_DM*/NULL,
+ /* applyModifier_DM */ NULL,
+ /* applyModifierEM_DM */NULL,
+
/* deformVerts */ NULL,
/* deformMatrices */ NULL,
/* deformVertsEM */ NULL,
diff --cc source/blender/modifiers/intern/MOD_cast.c
index 11c8ba4a9cd,bac95e4c1c1..18c64a24392
--- a/source/blender/modifiers/intern/MOD_cast.c
+++ b/source/blender/modifiers/intern/MOD_cast.c
@@@ -479,18 -484,10 +469,18 @@@ ModifierTypeInfo modifierType_Cast =
eModifierTypeFlag_AcceptsLattice |
eModifierTypeFlag_SupportsEditmode,
- /* copyData */ copyData,
+ /* copyData */ modifier_copyData_generic,
- /* deformVerts */ deformVerts,
+
+ /* deformVerts_DM */ deformVerts,
+ /* deformMatrices_DM */ NULL,
+ /* deformVertsEM_DM */ deformVertsEM,
+ /* deformMatricesEM_DM*/NULL,
+ /* applyModifier_DM */ NULL,
+ /* applyModifierEM_DM */NULL,
+
+ /* deformVerts */ NULL,
/* deformMatrices */ NULL,
- /* deformVertsEM */ deformVertsEM,
+ /* deformVertsEM */ NULL,
/* deformMatricesEM */ NULL,
/* applyModifier */ NULL,
/* applyModifierEM */ NULL,
diff --cc source/blender/modifiers/intern/MOD_curve.c
index e7f7bed2055,91772faa08b..805d27de273
--- a/source/blender/modifiers/intern/MOD_curve.c
+++ b/source/blender/modifiers/intern/MOD_curve.c
@@@ -168,15 -151,7 +159,15 @@@ ModifierTypeInfo modifierType_Curve =
eModifierTypeFlag_AcceptsLattice |
eModifierTypeFlag_SupportsEditmode,
- /* copyData */ copyData,
+ /* copyData */ modifier_copyData_generic,
+
+ /* deformVerts_DM */ NULL,
+ /* deformMatrices_DM */ NULL,
+ /* deformVertsEM_DM */ NULL,
+ /* deformMatricesEM_DM*/NULL,
+ /* applyModifier_DM */ NULL,
+ /* applyModifierEM_DM */NULL,
+
/* deformVerts */ deformVerts,
/* deformMatrices */ NULL,
/* deformVertsEM */ deformVertsEM,
diff --cc source/blender/modifiers/intern/MOD_datatransfer.c
index 863a6a3bb14,3a8887296f2..21d1a6a865d
--- a/source/blender/modifiers/intern/MOD_datatransfer.c
+++ b/source/blender/modifiers/intern/MOD_datatransfer.c
@@@ -220,15 -227,7 +211,15 @@@ ModifierTypeInfo modifierType_DataTrans
eModifierTypeFlag_SupportsEditmode |
eModifierTypeFlag_UsesPreview,
- /* copyData */ copyData,
+ /* copyData */ modifier_copyData_generic,
+
+ /* deformVerts_DM */ NULL,
+ /* deformMatrices_DM */ NULL,
+ /* deformVertsEM_DM */ NULL,
+ /* deformMatricesEM_DM*/NULL,
+ /* applyModifier_DM */ applyModifier,
+ /* applyModifierEM_DM */NULL,
+
/* deformVerts */ NULL,
/* deformMatrices */ NULL,
/* deformVertsEM */ NULL,
diff --cc source/blender/modifiers/intern/MOD_decimate.c
index dfa76e53f84,56aab400993..3a7ccc44f74
--- a/source/blender/modifiers/intern/MOD_decimate.c
+++ b/source/blender/modifiers/intern/MOD_decimate.c
@@@ -215,15 -207,7 +206,16 @@@ ModifierTypeInfo modifierType_Decimate
/* type */ eModifierTypeType_Nonconstructive,
/* flags */ eModifierTypeFlag_AcceptsMesh |
eModifierTypeFlag_AcceptsCVs,
- /* copyData */ copyData,
++
+ /* copyData */ modifier_copyData_generic,
+
+ /* deformVerts_DM */ NULL,
+ /* deformMatrices_DM */ NULL,
+ /* deformVertsEM_DM */ NULL,
+ /* deformMatricesEM_DM*/NULL,
+ /* applyModifier_DM */ applyModifier,
+ /* applyModifierEM_DM */NULL,
+
/* deformVerts */ NULL,
/* deformMatrices */ NULL,
/* deformVertsEM */ NULL,
diff --cc source/blender/modifiers/intern/MOD_displace.c
index ecb4da71699,e63d015ac9a..c28bb41647f
--- a/source/blender/modifiers/intern/MOD_displace.c
+++ b/source/blender/modifiers/intern/MOD_displace.c
@@@ -417,15 -417,7 +407,15 @@@ ModifierTypeInfo modifierType_Displace
/* flags */ eModifierTypeFlag_AcceptsMesh |
eModifierTypeFlag_SupportsEditmode,
- /* copyData */ copyData,
+ /* copyData */ modifier_copyData_generic,
+
+ /* deformVerts_DM */ NULL,
+ /* deformMatrices_DM */ NULL,
+ /* deformVertsEM_DM */ NULL,
+ /* deformMatricesEM_DM*/NULL,
+ /* applyModifier_DM */ NULL,
+ /* applyModifierEM_DM */NULL,
+
/* deformVerts */ deformVerts,
/* deformMatrices */ NULL,
/* deformVertsEM */ deformVertsEM,
diff --cc source/blender/modifiers/intern/MOD_edgesplit.c
index 10e26a918be,849cca53005..d2e36c39816
--- a/source/blender/modifiers/intern/MOD_edgesplit.c
+++ b/source/blender/modifiers/intern/MOD_edgesplit.c
@@@ -124,20 -112,10 +124,11 @@@ static void initData(ModifierData *md
emd->flags = MOD_EDGESPLIT_FROMANGLE | MOD_EDGESPLIT_FROMFLAG;
}
- static void copyData(ModifierData *md, ModifierData *target)
- {
- #if 0
- EdgeSplitModifierData *emd = (EdgeSplitModifierData *) md;
- EdgeSplitModifierData *temd = (EdgeSplitModifierData *) target;
- #endif
- modifier_copyData_generic(md, target);
- }
-
-static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob), DerivedMesh
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list