Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-02-25 08:50:06 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-02-25 08:50:06 +0300
commit727d430811e2911167778aa7ab612e810c1990c2 (patch)
treec62de3970e3182fd0cf30522bbf6b61bae1faefb /source/blender/blenloader/intern/versioning_260.c
parenta322b43e3d083fd0060db7ced8573b0c96bb6972 (diff)
Cleanup: move deprecated enum into versioning code
Diffstat (limited to 'source/blender/blenloader/intern/versioning_260.c')
-rw-r--r--source/blender/blenloader/intern/versioning_260.c17
1 files changed, 17 insertions, 0 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;