Differential D9526 Diff 31011 source/blender/makesdna/DNA_modifier_types.h

Changeset View

Standalone View

Context not available.

	float timeoffs, lifetime;	float timeoffs, lifetime;
	char _pad1[4];	char _pad1[4];

		int waveshape;
		char _pad2[4];
	} WaveModifierData;	} WaveModifierData;
		mont29Unsubmitted Not Done Inline Actions You can instead remove `_pad1` and replace it by that new int. mont29: You can instead remove `_pad1` and replace it by that new int.

	/* WaveModifierData.flag */	/* WaveModifierData.flag */
Context not available.
	MOD_WAVE_NORM_X = (1 << 5),	MOD_WAVE_NORM_X = (1 << 5),
	MOD_WAVE_NORM_Y = (1 << 6),	MOD_WAVE_NORM_Y = (1 << 6),
	MOD_WAVE_NORM_Z = (1 << 7),	MOD_WAVE_NORM_Z = (1 << 7),
		MOD_WAVE_LOCK = (1 << 8)
		};

		/* WaveModifierData->waveshape */
		enum {
		MOD_WAVE_SHAPE_GAUSSIAN = 0,
		MOD_WAVE_SHAPE_SINE = 1
	};	};

	typedef struct ArmatureModifierData {	typedef struct ArmatureModifierData {
Context not available.