diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-02-25 08:50:06 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-02-25 08:50:06 +0300 |
commit | 727d430811e2911167778aa7ab612e810c1990c2 (patch) | |
tree | c62de3970e3182fd0cf30522bbf6b61bae1faefb /source/blender | |
parent | a322b43e3d083fd0060db7ced8573b0c96bb6972 (diff) |
Cleanup: move deprecated enum into versioning code
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenloader/intern/versioning_260.c | 17 | ||||
-rw-r--r-- | source/blender/editors/space_image/image_ops.c | 3 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 19 |
3 files changed, 17 insertions, 22 deletions
diff --git a/source/blender/blenloader/intern/versioning_260.c b/source/blender/blenloader/intern/versioning_260.c index f23e4b5e2a4..7c70728e50c 100644 --- a/source/blender/blenloader/intern/versioning_260.c +++ b/source/blender/blenloader/intern/versioning_260.c @@ -147,6 +147,23 @@ static void do_versions_nodetree_convert_angle(bNodeTree *ntree) static void do_versions_image_settings_2_60(Scene *sce) { + /* RenderData.subimtype flag options for imtype */ + enum { + R_OPENEXR_HALF = (1 << 0), + R_OPENEXR_ZBUF = (1 << 1), + R_PREVIEW_JPG = (1 << 2), + R_CINEON_LOG = (1 << 3), + R_TIFF_16BIT = (1 << 4), + + R_JPEG2K_12BIT = (1 << 5), + /* Jpeg2000 */ + R_JPEG2K_16BIT = (1 << 6), + R_JPEG2K_YCC = (1 << 7), + /* when disabled use RGB */ + R_JPEG2K_CINE_PRESET = (1 << 8), + R_JPEG2K_CINE_48FPS = (1 << 9), + }; + /* note: rd->subimtype is moved into individual settings now and no longer * exists */ RenderData *rd = &sce->r; diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 6dc4a7f950c..0f9ebfb912c 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1980,9 +1980,6 @@ static int image_save_options_init(Main *bmain, opts->im_format.views_format = ima->views_format; } - ///* XXX - this is lame, we need to make these available too! */ - // opts->subimtype = scene->r.subimtype; - BLI_strncpy(opts->filepath, ibuf->name, sizeof(opts->filepath)); /* sanitize all settings */ diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 0b5ab37b5ca..71f701b87ad 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1926,25 +1926,6 @@ enum { R_COLOR_MANAGEMENT_UNUSED_1 = (1 << 1), }; -#ifdef DNA_DEPRECATED_ALLOW -/* RenderData.subimtype flag options for imtype */ -enum { - R_OPENEXR_HALF = (1 << 0), /*deprecated*/ - R_OPENEXR_ZBUF = (1 << 1), /*deprecated*/ - R_PREVIEW_JPG = (1 << 2), /*deprecated*/ - R_CINEON_LOG = (1 << 3), /*deprecated*/ - R_TIFF_16BIT = (1 << 4), /*deprecated*/ - - R_JPEG2K_12BIT = (1 << 5), - /* Jpeg2000 */ /*deprecated*/ - R_JPEG2K_16BIT = (1 << 6), /*deprecated*/ - R_JPEG2K_YCC = (1 << 7), - /* when disabled use RGB */ /*deprecated*/ - R_JPEG2K_CINE_PRESET = (1 << 8), /*deprecated*/ - R_JPEG2K_CINE_48FPS = (1 << 9), /*deprecated*/ -}; -#endif - /* bake_mode: same as RE_BAKE_xxx defines */ /* RenderData.bake_flag */ #define R_BAKE_CLEAR (1 << 0) |