diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-19 09:21:15 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-19 09:21:15 +0300 |
| commit | c850320b35863edc35f0b0acd1c75ed48bb71542 (patch) | |
| tree | c3de2f92410308c0ece880a901864727b5731fc3 /source/blender/makesdna | |
| parent | 4d3d002b653c5b28320ada6b9d7f1e8c80bf944c (diff) | |
| parent | 7a24e0d175827824d139f7627de2a5af34d687fb (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 4d910588975..671ad1bc954 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1732,7 +1732,8 @@ typedef struct Scene { #define R_BORDER 0x0200 #define R_PANORAMA 0x0400 /* deprecated as scene option, still used in renderer */ #define R_CROP 0x0800 -/*#define R_COSMO 0x1000 deprecated */ + /* Disable camera switching: runtime (DURIAN_CAMERA_SWITCH) */ +#define R_NO_CAMERA_SWITCH 0x1000 #define R_ODDFIELD 0x2000 #define R_MBLUR 0x4000 /* unified was here */ |