diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-02-13 09:33:07 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-02-13 09:33:07 +0300 |
| commit | c8f04eba487ea43eaf1c8658eccd53711f2760bf (patch) | |
| tree | 0fdeb307681c120833289291634a87b13b6f1326 /source/blender/makesdna | |
| parent | cec4a299771ec0302db6f733ca28e80cbbf3cff4 (diff) | |
Animato: Various improvements
* Scene and World AnimDatas are now included in animation editors
* Keyframes for integer-value settings now get the FCURVE_INT_VALUES flag set for their F-Curves, which restricts those curves to only having integer-values. F-Curve displays have been altered accordingly, but some editing tools may still need tweaks to work with this.
* Fixed notifiers for Insert Keyframe -> Active Keying Set.
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_action_types.h | 5 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 8 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_world_types.h | 9 |
3 files changed, 17 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index 0187834af6b..cf54d69bb8b 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -289,14 +289,13 @@ typedef enum DOPESHEET_FILTERFLAG { ADS_FILTER_ONLYDRIVERS = (1<<1), /* datatype-based filtering */ - ADS_FILTER_NOOBJ = (1<<4), // XXX - ADS_FILTER_NOARM = (1<<5), // XXX - ADS_FILTER_NOSHAPEKEYS = (1<<6), ADS_FILTER_NOCAM = (1<<10), ADS_FILTER_NOMAT = (1<<11), ADS_FILTER_NOLAM = (1<<12), ADS_FILTER_NOCUR = (1<<13), + ADS_FILTER_NOWOR = (1<<14), + ADS_FILTER_NOSCE = (1<<15), /* combination filters (some only used at runtime) */ ADS_FILTER_NOOBDATA = (ADS_FILTER_NOCAM|ADS_FILTER_NOMAT|ADS_FILTER_NOLAM|ADS_FILTER_NOCUR), diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 7b618502089..e48300917d5 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -535,8 +535,9 @@ typedef struct Scene { float editbutsize; /* size of normals */ short selectmode; /* for mesh only! */ short proportional, prop_mode; - short automerge, pad5, pad6; + short automerge, pad5; + short flag; /* various settings */ short autokey_mode; /* mode for autokeying (defines in DNA_userdef_types.h) */ short use_nodes; @@ -801,6 +802,11 @@ typedef struct Scene { #define PROP_CONST 5 #define PROP_RANDOM 6 +/* sce->flag */ +#define SCE_DS_SELECTED (1<<0) +#define SCE_DS_COLLAPSED (1<<1) + + /* return flag next_object function */ #define F_START 0 #define F_SCENE 1 diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h index 39d8d38ec54..3fd6642df8a 100644 --- a/source/blender/makesdna/DNA_world_types.h +++ b/source/blender/makesdna/DNA_world_types.h @@ -104,8 +104,12 @@ typedef struct World { short aomode, aosamp, aomix, aocolor; float ao_adapt_thresh, ao_adapt_speed_fac; float ao_approx_error, ao_approx_correction; - short ao_samp_method, ao_gather_method, ao_approx_passes, pad1; + short ao_samp_method, ao_gather_method, ao_approx_passes; + /* assorted settings (in the middle of ambient occlusion settings for padding reasons) */ + short flag; + + /* ambient occlusion (contd...) */ float *aosphere, *aotables; @@ -180,5 +184,8 @@ typedef struct World { #define WOPHY_ODE 4 #define WOPHY_BULLET 5 +/* flag */ +#define WO_DS_EXPAND (1<<0) + #endif |