diff options
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 52 |
1 files changed, 16 insertions, 36 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 002d77fb0e6..232fe62df31 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -316,6 +316,7 @@ typedef struct ImageFormatData { #define R_IMF_IMTYPE_H264 31 #define R_IMF_IMTYPE_XVID 32 #define R_IMF_IMTYPE_THEORA 33 +#define R_IMF_IMTYPE_PSD 34 #define R_IMF_IMTYPE_INVALID 255 @@ -510,6 +511,7 @@ typedef struct RenderData { short bake_normal_space, bake_quad_split; float bake_maxdist, bake_biasdist; short bake_samples, bake_pad; + float bake_user_scale, bake_pad1; /* path to render output */ char pic[1024]; /* 1024 = FILE_MAX */ @@ -981,17 +983,6 @@ typedef struct ToolSettings { * paint */ float vgroup_weight; - /* Subdivide Settings */ - short cornertype; - short pad1; - /*Triangle to Quad conversion threshold*/ - float jointrilimit; - /* Editmode Tools */ - float degr; - short step; - short turn; - - float extr_offs; /* extrude offset */ float doublimit; /* remove doubles limit */ float normalsize; /* size of normals */ short automerge; @@ -999,30 +990,21 @@ typedef struct ToolSettings { /* Selection Mode for Mesh */ short selectmode; - /* Primitive Settings */ - /* UV Sphere */ - short segments; - short rings; - - /* Cylinder - Tube - Circle */ - short vertices; - /* UV Calculation */ - short unwrapper; - float uvcalc_radius; - float uvcalc_cubesize; + char unwrapper; + char uvcalc_flag; + char uv_flag; + char uv_selectmode; + float uvcalc_margin; - short uvcalc_mapdir; - short uvcalc_mapalign; - short uvcalc_flag; - short uv_flag, uv_selectmode; - short pad2; - - /* Grease Pencil */ - short gpencil_flags; - + /* Auto-IK */ - short autoik_chainlen; + short autoik_chainlen; /* runtime only */ + + /* Grease Pencil */ + char gpencil_flags; + + char pad[5]; /* Image Paint (8 byttse aligned please!) */ struct ImagePaintSettings imapaint; @@ -1035,16 +1017,13 @@ typedef struct ToolSettings { /* Select Group Threshold */ float select_thresh; - - /* Graph Editor */ - float clean_thresh; /* Auto-Keying Mode */ short autokey_mode, autokey_flag; /* defines in DNA_userdef_types.h */ /* Multires */ char multires_subdiv_type; - char pad3[5]; + char pad3[1]; /* Skeleton generation */ short skgen_resolution; @@ -1375,6 +1354,7 @@ typedef struct Scene { #define R_BAKE_MULTIRES 16 #define R_BAKE_LORES_MESH 32 #define R_BAKE_VCOL 64 +#define R_BAKE_USERSCALE 128 /* bake_normal_space */ #define R_BAKE_SPACE_CAMERA 0 |