Differential D3383 Diff 11022 source/blender/makesdna/DNA_effect_types.h

Changeset View

Standalone View

source/blender/makesdna/DNA_effect_types.h

	Show First 20 Lines • Show All 91 Lines • ▼ Show 20 Lines
	#			#
	#			#
	typedef struct Particle {			typedef struct Particle {
	float co[3], no[3];			float co[3], no[3];
	float time, lifetime;			float time, lifetime;
	short mat_nr, rt;			short mat_nr, rt;
	} Particle;			} Particle;

	struct Group;			struct Collection;

	typedef struct PartEff {			typedef struct PartEff {
	struct PartEff next, prev;			struct PartEff next, prev;
	short type, flag, buttype, stype, vertgroup, userjit;			short type, flag, buttype, stype, vertgroup, userjit;

	float sta, end, lifetime;			float sta, end, lifetime;
	int totpart, totkey, seed;			int totpart, totkey, seed;

	float normfac, obfac, randfac, texfac, randlife;			float normfac, obfac, randfac, texfac, randlife;
	float force[3];			float force[3];
	float damp;			float damp;

	float nabla, vectsize, maxlen, pad, defvec[3];			float nabla, vectsize, maxlen, pad, defvec[3];

	float mult[4], life[4];			float mult[4], life[4];
	short child[4], mat[4];			short child[4], mat[4];
	short texmap, curmult;			short texmap, curmult;
	short staticstep, omat, timetex, speedtex, flag2, flag2neg;			short staticstep, omat, timetex, speedtex, flag2, flag2neg;
	short disp, vertgroup_v;			short disp, vertgroup_v;

	char vgroupname[64], vgroupname_v[64]; /* MAX_VGROUP_NAME */			char vgroupname[64], vgroupname_v[64]; /* MAX_VGROUP_NAME */
	float imat[4][4]; /* inverse matrix of parent Object */			float imat[4][4]; /* inverse matrix of parent Object */

	Particle *keys;			Particle *keys;
	struct Group *group;			struct Collection *group;

	} PartEff;			} PartEff;


	typedef struct WaveEff {			typedef struct WaveEff {
	struct WaveEff next, prev;			struct WaveEff next, prev;
	short type, flag, buttype, stype;			short type, flag, buttype, stype;

	Show All 9 Lines