Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 4 Apr 2018 13:03:55 +0000 (15:03 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 4 Apr 2018 13:03:55 +0000 (15:03 +0200)
Conflicts:
source/blender/blenkernel/BKE_object.h

12 files changed:
1  2 
source/blender/blenkernel/BKE_modifier.h
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/object.c
source/blender/editors/object/object_add.c
source/blender/modifiers/intern/MOD_displace.c
source/blender/modifiers/intern/MOD_meshsequencecache.c
source/blender/modifiers/intern/MOD_wave.c
source/blender/modifiers/intern/MOD_weightvgedit.c
source/blender/modifiers/intern/MOD_weightvgmix.c
source/blender/modifiers/intern/MOD_weightvgproximity.c

index 11e259e031813e445d83b9f258a19e4579f5fe9a,3fea26e73590482295c269e9d6fd022dbee2a860..1af31d5e024a7f9473b7ab4d21a57fcda3a5a327
@@@ -74,10 -72,8 +74,10 @@@ void BKE_object_modifier_hook_reset(str
  
  bool BKE_object_support_modifier_type_check(struct Object *ob, int modifier_type);
  
 -void BKE_object_link_modifiers(struct Object *ob_dst, const struct Object *ob_src);
 +void BKE_object_link_modifiers(
 +        struct Object *ob_dst, const struct Object *ob_src,
 +        eObjectMode object_mode);
- void BKE_object_free_modifiers(struct Object *ob);
+ void BKE_object_free_modifiers(struct Object *ob, const int flag);
  
  void BKE_object_make_proxy(struct Object *ob, struct Object *target, struct Object *gob);
  void BKE_object_copy_proxy_drivers(struct Object *ob, struct Object *target);
index 73f47dec9cb29d1739489c143887e70f503845e7,751cd733ae1c4f0273fb423053739bb93f0d46be..59d2bcc89fdb0f7820d11171f33bf8d18500606c
@@@ -262,12 -265,10 +262,12 @@@ bool BKE_object_support_modifier_type_c
        return true;
  }
  
 -void BKE_object_link_modifiers(struct Object *ob_dst, const struct Object *ob_src)
 +void BKE_object_link_modifiers(
 +        struct Object *ob_dst, const struct Object *ob_src,
 +        eObjectMode object_mode)
  {
        ModifierData *md;
-       BKE_object_free_modifiers(ob_dst);
+       BKE_object_free_modifiers(ob_dst, 0);
  
        if (!ELEM(ob_dst->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_LATTICE)) {
                /* only objects listed above can have modifiers and linking them to objects
index 3590b38310f27ae067c9bf78a63fb9aa014d9598,6715879361a27ad688f43bac39be824a3b3cb973..96a5a95a5cd61a3f2b06125867a873a1cec3b802
@@@ -1810,10 -1724,10 +1810,10 @@@ static int convert_exec(bContext *C, wm
                                newob = ob;
                        }
  
 -                      BKE_mesh_to_curve(scene, newob);
 +                      BKE_mesh_to_curve(&eval_ctx, scene, newob);
  
                        if (newob->type == OB_CURVE) {
-                               BKE_object_free_modifiers(newob);   /* after derivedmesh calls! */
+                               BKE_object_free_modifiers(newob, 0);   /* after derivedmesh calls! */
                                ED_rigidbody_object_remove(bmain, scene, newob);
                        }
                }
index f90e6cc1d366fa836436ca826591b6234b146747,72122fae6b45cc1170cc435b8f0a9f94973ce908..7ec89b23f2501cbd2fca8b03f4d66b9c48507ac5
@@@ -422,8 -436,9 +414,8 @@@ ModifierTypeInfo modifierType_Displace 
        /* applyModifierEM */   NULL,
        /* initData */          initData,
        /* requiredDataMask */  requiredDataMask,
-       /* freeData */          freeData,
+       /* freeData */          NULL,
        /* isDisabled */        isDisabled,
 -      /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     dependsOnTime,
        /* dependsOnNormals */  dependsOnNormals,
index 33b2d904c23ca3b0233dcb8dab28da3a8d4d560a,8fe29c78486d4f8678c9b1011f83e9844f67be8e..7921ea662a72dc9ab6592c627e339445dbeda944
@@@ -366,8 -375,9 +358,8 @@@ ModifierTypeInfo modifierType_Wave = 
        /* applyModifierEM */   NULL,
        /* initData */          initData,
        /* requiredDataMask */  requiredDataMask,
-       /* freeData */          freeData,
+       /* freeData */          NULL,
        /* isDisabled */        NULL,
 -      /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     dependsOnTime,
        /* dependsOnNormals */  NULL,
index 1947e7e1f0fc0cb95858f50c9e4dfb577eb7397f,bd1f58e7d5ea4a49cc7e752b34d41371faedc605..45c41498792b61b6706d0563da55ec30bccafb3c
@@@ -409,8 -419,9 +401,8 @@@ ModifierTypeInfo modifierType_WeightVGM
        /* applyModifierEM */   NULL,
        /* initData */          initData,
        /* requiredDataMask */  requiredDataMask,
-       /* freeData */          freeData,
+       /* freeData */          NULL,
        /* isDisabled */        isDisabled,
 -      /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     dependsOnTime,
        /* dependsOnNormals */  NULL,
index 87c6a03a53682508c8832e31bf096dbd7307cd8b,09991887f693a0b2f8c828e03b3c074c7dc2e0bc..84c5207830ee9988d420afc8dca322789f8a8818
@@@ -592,8 -608,9 +584,8 @@@ ModifierTypeInfo modifierType_WeightVGP
        /* applyModifierEM */   NULL,
        /* initData */          initData,
        /* requiredDataMask */  requiredDataMask,
-       /* freeData */          freeData,
+       /* freeData */          NULL,
        /* isDisabled */        isDisabled,
 -      /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     dependsOnTime,
        /* dependsOnNormals */  NULL,