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:
authorRichard Antalik <richardantalik@gmail.com>2020-10-05 03:24:51 +0300
committerRichard Antalik <richardantalik@gmail.com>2020-10-05 03:24:51 +0300
commitd12ff69320713420bb3fc4e1ac38c3f90202d392 (patch)
treea90698ee9a40ee3f77455a55382d923b151e3248 /source/blender/blenkernel/intern/sequencer.c
parentf375ec4986daed7d54ca2bb418b764536f201b94 (diff)
Rename eSpaceSeq_Proxy_RenderSize members
Remove word proxy from eSpaceSeq_Proxy_RenderSize members if proxy is not used with that item. Otherwise this can be a bit confusing. Reviewed By: brecht Differential Revision: https://developer.blender.org/D8861
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
-rw-r--r--source/blender/blenkernel/intern/sequencer.c16
1 files changed, 8 insertions, 8 deletions
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 {