[Bf-blender-cvs] [605928c15b0] functions: Merge branch 'master' into functions
Jacques Lucke
noreply at git.blender.org
Mon Feb 10 12:26:35 CET 2020
Commit: 605928c15b0748068137c620e1894112b838baf2
Author: Jacques Lucke
Date: Mon Feb 10 12:01:07 2020 +0100
Branches: functions
https://developer.blender.org/rB605928c15b0748068137c620e1894112b838baf2
Merge branch 'master' into functions
===================================================================
===================================================================
diff --cc source/blender/makesdna/DNA_modifier_types.h
index fb09a608b6e,2c0d34fdccf..0510f03fa4c
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@@ -2033,66 -2046,8 +2050,70 @@@ enum
#define MOD_MESHSEQ_READ_ALL \
(MOD_MESHSEQ_READ_VERT | MOD_MESHSEQ_READ_POLY | MOD_MESHSEQ_READ_UV | MOD_MESHSEQ_READ_COLOR)
+typedef struct FunctionDeformModifierData {
+ ModifierData modifier;
+ float control1;
+ int control2;
+ struct bNodeTree *function_tree;
+} FunctionDeformModifierData;
+
+typedef struct FunctionPointsModifierData {
+ ModifierData modifier;
+ float control1;
+ int control2;
+ struct bNodeTree *function_tree;
+} FunctionPointsModifierData;
+
+typedef struct BParticlesAttributeCacheFloat {
+ char name[64];
+ unsigned int floats_per_particle;
+ char _pad[4];
+ float *values;
+} BParticlesAttributeCacheFloat;
+
+typedef struct BParticlesTypeCache {
+ char name[64];
+ unsigned int particle_amount;
+
+ unsigned int num_attributes_float;
+ BParticlesAttributeCacheFloat *attributes_float;
+} BParticlesTypeCache;
+
+typedef struct BParticlesFrameCache {
+ unsigned int num_particle_types;
+ float frame;
+ BParticlesTypeCache *particle_types;
+} BParticlesFrameCache;
+
+typedef enum eBParticlesOutputType {
+ MOD_BPARTICLES_OUTPUT_POINTS,
+ MOD_BPARTICLES_OUTPUT_TETRAHEDONS,
+ MOD_BPARTICLES_OUTPUT_NONE,
+} eBParticlesOutputType;
+
+typedef struct BParticlesModifierData {
+ ModifierData modifier;
+
+ /* eBParticlesOutputType */
+ unsigned int output_type;
+
+ unsigned int num_cached_frames;
+ struct bNodeTree *node_tree;
+ BParticlesFrameCache *cached_frames;
+} BParticlesModifierData;
+
+typedef struct BParticlesOutputModifierData {
+ ModifierData modifier;
+ struct Object *source_object;
+ char source_particle_system[64];
+
+ /* eBParticlesOutputType */
+ unsigned int output_type;
+ char _pad[4];
+} BParticlesOutputModifierData;
+
+ #ifdef __cplusplus
+ }
+ #endif
+
#endif /* __DNA_MODIFIER_TYPES_H__ */
More information about the Bf-blender-cvs
mailing list