[Bf-blender-cvs] [96f4c3438e8] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

Antonio Vazquez noreply at git.blender.org
Wed Apr 4 15:45:07 CEST 2018


Commit: 96f4c3438e812bd1479a0666b38840f77faadb11
Author: Antonio Vazquez
Date:   Wed Apr 4 15:44:58 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB96f4c3438e812bd1479a0666b38840f77faadb11

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/blenkernel/intern/object.c
index 18824e2210d,59d2bcc89fd..b597a13909c
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@@ -299,9 -267,9 +299,9 @@@ void BKE_object_link_modifiers
          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)) {
 +	if (!ELEM(ob_dst->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_LATTICE, OB_GPENCIL)) {
  		/* only objects listed above can have modifiers and linking them to objects
  		 * which doesn't have modifiers stack is quite silly */
  		return;
diff --cc source/blender/modifiers/intern/MOD_displace.c
index c21570c8e47,7ec89b23f25..ea6198dc5ac
--- a/source/blender/modifiers/intern/MOD_displace.c
+++ b/source/blender/modifiers/intern/MOD_displace.c
@@@ -420,12 -412,9 +412,12 @@@ ModifierTypeInfo modifierType_Displace 
  	/* deformMatricesEM */  NULL,
  	/* applyModifier */     NULL,
  	/* applyModifierEM */   NULL,
 +	/* deformStroke */      NULL,
 +	/* generateStrokes */   NULL,
 +	/* bakeModifierGP */    NULL,
  	/* initData */          initData,
  	/* requiredDataMask */  requiredDataMask,
- 	/* freeData */          freeData,
+ 	/* freeData */          NULL,
  	/* isDisabled */        isDisabled,
  	/* updateDepsgraph */   updateDepsgraph,
  	/* dependsOnTime */     dependsOnTime,
diff --cc source/blender/modifiers/intern/MOD_wave.c
index 9dd4c643007,7921ea662a7..4b1cb28af8c
--- a/source/blender/modifiers/intern/MOD_wave.c
+++ b/source/blender/modifiers/intern/MOD_wave.c
@@@ -364,12 -356,9 +356,12 @@@ ModifierTypeInfo modifierType_Wave = 
  	/* deformMatricesEM */  NULL,
  	/* applyModifier */     NULL,
  	/* applyModifierEM */   NULL,
 +	/* deformStroke */      NULL,
 +	/* generateStrokes */   NULL,
 +	/* bakeModifierGP */    NULL,
  	/* initData */          initData,
  	/* requiredDataMask */  requiredDataMask,
- 	/* freeData */          freeData,
+ 	/* freeData */          NULL,
  	/* isDisabled */        NULL,
  	/* updateDepsgraph */   updateDepsgraph,
  	/* dependsOnTime */     dependsOnTime,
diff --cc source/blender/modifiers/intern/MOD_weightvgmix.c
index 32cc473a9d7,45c41498792..5281ea57c4a
--- a/source/blender/modifiers/intern/MOD_weightvgmix.c
+++ b/source/blender/modifiers/intern/MOD_weightvgmix.c
@@@ -407,12 -399,9 +399,12 @@@ ModifierTypeInfo modifierType_WeightVGM
  	/* deformMatricesEM */  NULL,
  	/* applyModifier */     applyModifier,
  	/* applyModifierEM */   NULL,
 +	/* deformStroke */      NULL,
 +	/* generateStrokes */   NULL,
 +	/* bakeModifierGP */    NULL,
  	/* initData */          initData,
  	/* requiredDataMask */  requiredDataMask,
- 	/* freeData */          freeData,
+ 	/* freeData */          NULL,
  	/* isDisabled */        isDisabled,
  	/* updateDepsgraph */   updateDepsgraph,
  	/* dependsOnTime */     dependsOnTime,
diff --cc source/blender/modifiers/intern/MOD_weightvgproximity.c
index a2ee12956e1,84c5207830e..457ae75cad4
--- a/source/blender/modifiers/intern/MOD_weightvgproximity.c
+++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c
@@@ -590,12 -582,9 +582,12 @@@ ModifierTypeInfo modifierType_WeightVGP
  	/* deformMatricesEM */  NULL,
  	/* applyModifier */     applyModifier,
  	/* applyModifierEM */   NULL,
 +	/* deformStroke */      NULL,
 +	/* generateStrokes */   NULL,
 +	/* bakeModifierGP */    NULL,
  	/* initData */          initData,
  	/* requiredDataMask */  requiredDataMask,
- 	/* freeData */          freeData,
+ 	/* freeData */          NULL,
  	/* isDisabled */        isDisabled,
  	/* updateDepsgraph */   updateDepsgraph,
  	/* dependsOnTime */     dependsOnTime,



More information about the Bf-blender-cvs mailing list