diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-06-11 21:17:02 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-06-11 21:17:02 +0400 |
| commit | df0b629e246cc7fa091b00b97a2158877bd10ce3 (patch) | |
| tree | 243613c408318df3964fc5ebcd5a7fc33b4ca56d /source/blender/makesdna | |
| parent | ad2f4905301854f07d59bc290488da7ce4e7df57 (diff) | |
| parent | 66134ea38166742444720a4fe2f8d95effd8866a (diff) | |
Merged changes in the trunk up to revision 29409.
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 98008451c06..d148717b363 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -760,9 +760,11 @@ typedef struct Scene { float cursor[3]; /* 3d cursor location */ float twcent[3]; /* center for transform widget */ float twmin[3], twmax[3]; /* boundbox of selection for transform widget */ - unsigned int lay; - + unsigned int lay; /* bitflags for layer visibility */ + int layact; /* active layer */ + int pad1; + short flag; /* various settings */ short use_nodes; |