[Bf-blender-cvs] [160e62b88cd] blender2.8: Merge branch 'master' into blender2.8

Bastien Montagne noreply at git.blender.org
Wed Apr 4 15:04:07 CEST 2018


Commit: 160e62b88cdcc927b7cb3741c7ea0565412e8016
Author: Bastien Montagne
Date:   Wed Apr 4 15:03:55 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB160e62b88cdcc927b7cb3741c7ea0565412e8016

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/blenkernel/BKE_object.h

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



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

diff --cc source/blender/blenkernel/BKE_object.h
index 11e259e0318,3fea26e7359..1af31d5e024
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@@ -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);
diff --cc source/blender/blenkernel/intern/object.c
index 73f47dec9cb,751cd733ae1..59d2bcc89fd
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@@ -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
diff --cc source/blender/editors/object/object_add.c
index 3590b38310f,6715879361a..96a5a95a5cd
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@@ -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);
  			}
  		}
diff --cc source/blender/modifiers/intern/MOD_displace.c
index f90e6cc1d36,72122fae6b4..7ec89b23f25
--- a/source/blender/modifiers/intern/MOD_displace.c
+++ b/source/blender/modifiers/intern/MOD_displace.c
@@@ -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,
diff --cc source/blender/modifiers/intern/MOD_wave.c
index 33b2d904c23,8fe29c78486..7921ea662a7
--- a/source/blender/modifiers/intern/MOD_wave.c
+++ b/source/blender/modifiers/intern/MOD_wave.c
@@@ -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,
diff --cc source/blender/modifiers/intern/MOD_weightvgmix.c
index 1947e7e1f0f,bd1f58e7d5e..45c41498792
--- a/source/blender/modifiers/intern/MOD_weightvgmix.c
+++ b/source/blender/modifiers/intern/MOD_weightvgmix.c
@@@ -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,
diff --cc source/blender/modifiers/intern/MOD_weightvgproximity.c
index 87c6a03a536,09991887f69..84c5207830e
--- a/source/blender/modifiers/intern/MOD_weightvgproximity.c
+++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c
@@@ -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,



More information about the Bf-blender-cvs mailing list