← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/blender/makesdna/DNA_cloth_types.h

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/makesdna/DNA_cloth_types.h
44
44
 * variables with different names to minimize confusion.
45
45
 */
46
46
 
47
 
typedef struct ClothSimSettings
48
 
{
49
 
        struct  LinkNode *cache; /* UNUSED atm */       
 
47
typedef struct ClothSimSettings {
 
48
        struct  LinkNode *cache; /* UNUSED atm */
50
49
        float   mingoal;        /* see SB */
51
50
        float   Cdis;           /* Mechanical damping of springs.               */
52
51
        float   Cvi;            /* Viscous/fluid damping.                       */
83
82
        short   shapekey_rest;  /* vertex group for scaling structural stiffness */
84
83
        short   presets; /* used for presets on GUI */
85
84
        short   reset;
86
 
        short   pad;
 
85
        short pad;
87
86
 
88
87
        struct EffectorWeights *effector_weights;
89
88
} ClothSimSettings;
90
89
 
91
90
 
92
 
typedef struct ClothCollSettings
93
 
{
 
91
typedef struct ClothCollSettings {
94
92
        struct  LinkNode *collision_list; /* e.g. pointer to temp memory for collisions */
95
93
        float   epsilon;                /* min distance for collisions.         */
96
94
        float   self_friction;          /* Fiction/damping with self contact. */
101
99
        short   self_loop_count;        /* How many iterations for the selfcollision loop       */
102
100
        short   loop_count;             /* How many iterations for the collision loop.          */
103
101
        struct Group *group;    /* Only use colliders from this group of objects */
 
102
        short   vgroup_selfcol; /* vgroup to paint which vertices are used for self collisions */
 
103
        short pad;
 
104
        int pad2;
104
105
} ClothCollSettings;
105
106
 
106
107