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:
authorHans Goudey <h.goudey@me.com>2020-10-01 20:56:34 +0300
committerHans Goudey <h.goudey@me.com>2020-10-01 20:56:34 +0300
commitc3238bd50010e43ad97edb07ca1b2fe04ddf7f45 (patch)
treefa43f6fba52cde9fad9c4931c970861b675e7ae9 /source/blender/blenkernel/BKE_cloth.h
parent4c0ef4f788a1037888d5cb0a87ac23d6fe84573e (diff)
Cleanup: Use DNA defaults for cloth modifier
Followup for rB8398050695 This requires moving a few enum definitions to DNA instead of BKE, and adding default definitions for the two structs the cloth modifier where the cloth modifier stores its settings. The defaults are also reordered to be consistent with the order of each item in the struct.
Diffstat (limited to 'source/blender/blenkernel/BKE_cloth.h')
-rw-r--r--source/blender/blenkernel/BKE_cloth.h42
1 files changed, 0 insertions, 42 deletions
diff --git a/source/blender/blenkernel/BKE_cloth.h b/source/blender/blenkernel/BKE_cloth.h
index 5af37829577..20e2122a195 100644
--- a/source/blender/blenkernel/BKE_cloth.h
+++ b/source/blender/blenkernel/BKE_cloth.h
@@ -193,47 +193,6 @@ typedef struct ClothSpring {
} \
((void)0)
-/* SIMULATION FLAGS: goal flags,.. */
-/* These are the bits used in SimSettings.flags. */
-typedef enum {
- /** Object is only collision object, no cloth simulation is done. */
- CLOTH_SIMSETTINGS_FLAG_COLLOBJ = (1 << 2),
- /** DEPRECATED, for versioning only. */
- CLOTH_SIMSETTINGS_FLAG_GOAL = (1 << 3),
- /** True if tearing is enabled. */
- CLOTH_SIMSETTINGS_FLAG_TEARING = (1 << 4),
- /** True if pressure sim is enabled. */
- CLOTH_SIMSETTINGS_FLAG_PRESSURE = (1 << 5),
- /** Use the user defined target volume. */
- CLOTH_SIMSETTINGS_FLAG_PRESSURE_VOL = (1 << 6),
- /** True if internal spring generation is enabled. */
- CLOTH_SIMSETTINGS_FLAG_INTERNAL_SPRINGS = (1 << 7),
- /** DEPRECATED, for versioning only. */
- CLOTH_SIMSETTINGS_FLAG_SCALING = (1 << 8),
- /** Require internal springs to be created between points with opposite normals. */
- CLOTH_SIMSETTINGS_FLAG_INTERNAL_SPRINGS_NORMAL = (1 << 9),
- /** Edit cache in edit-mode. */
- /* CLOTH_SIMSETTINGS_FLAG_CCACHE_EDIT = (1 << 12), */ /* UNUSED */
- /** Don't allow spring compression. */
- CLOTH_SIMSETTINGS_FLAG_RESIST_SPRING_COMPRESS = (1 << 13),
- /** Pull ends of loose edges together. */
- CLOTH_SIMSETTINGS_FLAG_SEW = (1 << 14),
- /** Make simulation respect deformations in the base object. */
- CLOTH_SIMSETTINGS_FLAG_DYNAMIC_BASEMESH = (1 << 15),
-} CLOTH_SIMSETTINGS_FLAGS;
-
-/* ClothSimSettings.bending_model. */
-typedef enum {
- CLOTH_BENDING_LINEAR = 0,
- CLOTH_BENDING_ANGULAR = 1,
-} CLOTH_BENDING_MODEL;
-
-/* COLLISION FLAGS */
-typedef enum {
- CLOTH_COLLSETTINGS_FLAG_ENABLED = (1 << 1), /* enables cloth - object collisions */
- CLOTH_COLLSETTINGS_FLAG_SELF = (1 << 2), /* enables selfcollisions */
-} CLOTH_COLLISIONSETTINGS_FLAGS;
-
/* Spring types as defined in the paper.*/
typedef enum {
CLOTH_SPRING_TYPE_STRUCTURAL = (1 << 1),
@@ -281,7 +240,6 @@ int cloth_bvh_collision(struct Depsgraph *depsgraph,
// needed for modifier.c
void cloth_free_modifier_extern(struct ClothModifierData *clmd);
void cloth_free_modifier(struct ClothModifierData *clmd);
-void cloth_init(struct ClothModifierData *clmd);
void clothModifier_do(struct ClothModifierData *clmd,
struct Depsgraph *depsgraph,
struct Scene *scene,