[Bf-blender-cvs] [23c262192ce] greasepencil-object: Merge branch 'master' into greasepencil-object

Antonioya noreply at git.blender.org
Tue Apr 2 16:51:38 CEST 2019


Commit: 23c262192ce3c7a429fd989a98c965bab76d605e
Author: Antonioya
Date:   Tue Apr 2 16:51:32 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rB23c262192ce3c7a429fd989a98c965bab76d605e

Merge branch 'master' into greasepencil-object

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



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

diff --cc source/blender/makesdna/DNA_gpencil_types.h
index 363c1dd504d,56e17fe9149..dc752cc0bc9
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@@ -199,14 -199,9 +199,15 @@@ typedef struct bGPDstroke 
  	/** Caps mode for each stroke extreme */
  	short caps[2];
  
 +	/** gradient control along y for color */
 +	float gradient_f;
 +	/** factor xy of shape for dots gradients */
 +	float gradient_s[2];
 +	char _pad_3[4];
 +
  	/** Vertex weight data. */
  	struct MDeformVert *dvert;
+ 	void *_pad3;
  
  	bGPDstroke_Runtime runtime;
  	char _pad2[4];



More information about the Bf-blender-cvs mailing list