Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiika Hamalainen <blender@miikah.org>2011-05-24 11:08:58 +0400
committerMiika Hamalainen <blender@miikah.org>2011-05-24 11:08:58 +0400
commit3b41ab432badf2d4598b798e0d0c6c9ece51172b (patch)
tree8b646a88ae5dbc8441b0434fc925f7e3f09c7bb5 /source/blender/makesdna/DNA_modifier_types.h
parent25e276d3570d292f7e0a1306a864419024465d3b (diff)
Applied Dynamic Paint 1.18f patch as a codebase for GSoC.
Diffstat (limited to 'source/blender/makesdna/DNA_modifier_types.h')
-rw-r--r--source/blender/makesdna/DNA_modifier_types.h19
1 files changed, 19 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index d2d8e014015..f7d30a45e6b 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -71,6 +71,7 @@ typedef enum ModifierType {
eModifierType_Solidify,
eModifierType_Screw,
eModifierType_Warp,
+ eModifierType_DynamicPaint,
NUM_MODIFIER_TYPES
} ModifierType;
@@ -749,6 +750,9 @@ typedef struct ScrewModifierData {
typedef struct WarpModifierData {
ModifierData modifier;
+
+
+
/* keep in sync with MappingInfoModifierData */
struct Tex *texture;
struct Object *map_object;
@@ -783,5 +787,20 @@ typedef enum {
eWarp_Falloff_Sphere = 7, /* PROP_SPHERE */
/* PROP_RANDOM not used */
} WarpModifierFalloff;
+/* Dynamic paint modifier flags */
+#define MOD_DYNAMICPAINT_TYPE_CANVAS (1 << 0)
+#define MOD_DYNAMICPAINT_TYPE_PAINT (1 << 1)
+typedef struct DynamicPaintModifierData {
+ ModifierData modifier;
+
+ struct DynamicPaintCanvasSettings *canvas;
+ struct DynamicPaintPainterSettings *paint;
+ float time;
+ int type; /* canvas / painter */
+ short baking; /* Set nonzero if baking,
+ * -> updates derived mesh on modifier call*/
+ short pad;
+ int pad2;
+} DynamicPaintModifierData;
#endif