diff options
-rw-r--r-- | source/blender/blenkernel/intern/seqeffects.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 16 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_draw.c | 6 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 14 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 14 | ||||
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 2 |
6 files changed, 27 insertions, 27 deletions
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index 6bf4b44ab8e..b4bc2d25155 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -3901,7 +3901,7 @@ static ImBuf *do_text_effect(const SeqRenderData *context, /* Compensate text size for preview render size. */ proxy_size_comp = context->scene->r.size / 100.0; - if (context->preview_render_size != SEQ_PROXY_RENDER_SIZE_SCENE) { + if (context->preview_render_size != SEQ_RENDER_SIZE_SCENE) { proxy_size_comp *= BKE_sequencer_rendersize_to_scale_factor(context->preview_render_size); } diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index caa2486b403..b8ccdec0902 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -1631,13 +1631,13 @@ typedef struct SeqIndexBuildContext { static IMB_Proxy_Size seq_rendersize_to_proxysize(int render_size) { switch (render_size) { - case SEQ_PROXY_RENDER_SIZE_25: + case SEQ_RENDER_SIZE_PROXY_25: return IMB_PROXY_25; - case SEQ_PROXY_RENDER_SIZE_50: + case SEQ_RENDER_SIZE_PROXY_50: return IMB_PROXY_50; - case SEQ_PROXY_RENDER_SIZE_75: + case SEQ_RENDER_SIZE_PROXY_75: return IMB_PROXY_75; - case SEQ_PROXY_RENDER_SIZE_100: + case SEQ_RENDER_SIZE_PROXY_100: return IMB_PROXY_100; } return IMB_PROXY_NONE; @@ -1646,11 +1646,11 @@ static IMB_Proxy_Size seq_rendersize_to_proxysize(int render_size) double BKE_sequencer_rendersize_to_scale_factor(int render_size) { switch (render_size) { - case SEQ_PROXY_RENDER_SIZE_25: + case SEQ_RENDER_SIZE_PROXY_25: return 0.25; - case SEQ_PROXY_RENDER_SIZE_50: + case SEQ_RENDER_SIZE_PROXY_50: return 0.50; - case SEQ_PROXY_RENDER_SIZE_75: + case SEQ_RENDER_SIZE_PROXY_75: return 0.75; } return 1.0; @@ -2714,7 +2714,7 @@ static ImBuf *input_preprocess(const SeqRenderData *context, /* Calculate scale factor for current image if needed. */ double scale_factor, image_scale_factor = 1.0; - if (context->preview_render_size == SEQ_PROXY_RENDER_SIZE_SCENE) { + if (context->preview_render_size == SEQ_RENDER_SIZE_SCENE) { scale_factor = image_scale_factor = (double)scene->r.size / 100; } else { diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 6efd95efe25..38b5ebaf78c 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -1250,11 +1250,11 @@ ImBuf *sequencer_ibuf_get(struct Main *bmain, double render_size; short is_break = G.is_break; - if (sseq->render_size == SEQ_PROXY_RENDER_SIZE_NONE) { + if (sseq->render_size == SEQ_RENDER_SIZE_NONE) { return NULL; } - if (sseq->render_size == SEQ_PROXY_RENDER_SIZE_SCENE) { + if (sseq->render_size == SEQ_RENDER_SIZE_SCENE) { render_size = scene->r.size / 100.0; } else { @@ -1795,7 +1795,7 @@ void sequencer_draw_preview(const bContext *C, GPU_framebuffer_bind_no_srgb(framebuffer_overlay); GPU_depth_test(GPU_DEPTH_NONE); - if (sseq->render_size == SEQ_PROXY_RENDER_SIZE_NONE) { + if (sseq->render_size == SEQ_RENDER_SIZE_NONE) { sequencer_preview_clear(); return; } diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 22045a97826..867da1bcb82 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -635,13 +635,13 @@ typedef enum eSpaceSeq_Displays { /* SpaceSeq.render_size */ typedef enum eSpaceSeq_Proxy_RenderSize { - SEQ_PROXY_RENDER_SIZE_NONE = -1, - SEQ_PROXY_RENDER_SIZE_SCENE = 0, - SEQ_PROXY_RENDER_SIZE_25 = 25, - SEQ_PROXY_RENDER_SIZE_50 = 50, - SEQ_PROXY_RENDER_SIZE_75 = 75, - SEQ_PROXY_RENDER_SIZE_100 = 99, - SEQ_PROXY_RENDER_SIZE_FULL = 100, + SEQ_RENDER_SIZE_NONE = -1, + SEQ_RENDER_SIZE_SCENE = 0, + SEQ_RENDER_SIZE_PROXY_25 = 25, + SEQ_RENDER_SIZE_PROXY_50 = 50, + SEQ_RENDER_SIZE_PROXY_75 = 75, + SEQ_RENDER_SIZE_PROXY_100 = 99, + SEQ_RENDER_SIZE_FULL = 100, } eSpaceSeq_Proxy_RenderSize; typedef struct MaskSpaceInfo { diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 39938d6e470..d26662e9a43 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -4703,13 +4703,13 @@ static void rna_def_space_sequencer(BlenderRNA *brna) }; static const EnumPropertyItem proxy_render_size_items[] = { - {SEQ_PROXY_RENDER_SIZE_NONE, "NONE", 0, "No display", ""}, - {SEQ_PROXY_RENDER_SIZE_SCENE, "SCENE", 0, "Scene render size", ""}, - {SEQ_PROXY_RENDER_SIZE_25, "PROXY_25", 0, "Proxy size 25%", ""}, - {SEQ_PROXY_RENDER_SIZE_50, "PROXY_50", 0, "Proxy size 50%", ""}, - {SEQ_PROXY_RENDER_SIZE_75, "PROXY_75", 0, "Proxy size 75%", ""}, - {SEQ_PROXY_RENDER_SIZE_100, "PROXY_100", 0, "Proxy size 100%", ""}, - {SEQ_PROXY_RENDER_SIZE_FULL, "FULL", 0, "No proxy, full render", ""}, + {SEQ_RENDER_SIZE_NONE, "NONE", 0, "No display", ""}, + {SEQ_RENDER_SIZE_SCENE, "SCENE", 0, "Scene render size", ""}, + {SEQ_RENDER_SIZE_PROXY_25, "PROXY_25", 0, "Proxy size 25%", ""}, + {SEQ_RENDER_SIZE_PROXY_50, "PROXY_50", 0, "Proxy size 50%", ""}, + {SEQ_RENDER_SIZE_PROXY_75, "PROXY_75", 0, "Proxy size 75%", ""}, + {SEQ_RENDER_SIZE_PROXY_100, "PROXY_100", 0, "Proxy size 100%", ""}, + {SEQ_RENDER_SIZE_FULL, "FULL", 0, "No proxy, full render", ""}, {0, NULL, 0, NULL, NULL}, }; diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 8b40c96e8d7..917193553dc 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -1508,7 +1508,7 @@ static void do_render_seq(Render *re) re->scene, re_x, re_y, - SEQ_PROXY_RENDER_SIZE_SCENE, + SEQ_RENDER_SIZE_SCENE, true, &context); |