diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-19 12:16:07 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-19 12:16:07 +0400 |
| commit | 66617d1b131dd51ca845cccb4453f85109b9e355 (patch) | |
| tree | ff609bd2f929438875bfab0f24fb2b10af098ba9 /source/blender/makesdna | |
| parent | 9e79af949bd1e71910b598c0e4b995209854adc5 (diff) | |
| parent | fbbd64a118cb4f1bf96029599ed3ec9d91734d6b (diff) | |
svn merge ^/trunk/blender -r47961:48070
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 1 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index a10d610c6d4..9bc002b7bbe 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -361,6 +361,7 @@ typedef struct bNodeSocketValueRGBA { #define CMP_NODE_DILATEERODE_STEP 0 #define CMP_NODE_DILATEERODE_DISTANCE_THRESH 1 #define CMP_NODE_DILATEERODE_DISTANCE 2 +#define CMP_NODE_DILATEERODE_DISTANCE_FEATHER 3 typedef struct NodeFrame { short flag; diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 24d33b49db2..83bfec3cc52 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -165,7 +165,7 @@ typedef struct Object { unsigned int lay; /* copy of Base's layer in the scene */ - int pad6; + float sf; /* sf is time-offset */ short flag; /* copy of Base */ short colbits DNA_DEPRECATED; /* deprecated */ @@ -180,8 +180,6 @@ typedef struct Object { int dupon, dupoff, dupsta, dupend; - float sf, ctime; /* sf is time-offset, ctime is the objects current time (XXX timing needs to be revised) */ - /* during realtime */ /* note that inertia is only called inertia for historical reasons |