blender
/
blender
129
397
Fork 572
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

Fix T59536: safe area values were swapped 

Reviewers: brecht

Differential Revision: https://developer.blender.org/D4097
This commit is contained in:
Jacques Lucke 2018-12-18 15:19:45 +01:00
parent 37c2382a49
commit 5fa749ace2
Notes: blender-bot 2023-02-14 04:25:19 +01:00 
Referenced by issue #59536, Wrong Camera Safe Areas: The default values of Title Safe Margins and Action Safe Margins replace each other
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/scene.c
View File

@ -782,8 +782,8 @@ void BKE_scene_init(Scene *sce)
sizeof(sce->sequencer_colorspace_settings.name));
/* Safe Areas */
copy_v2_fl2(sce->safe_areas.title, 3.5f / 100.0f, 3.5f / 100.0f);
copy_v2_fl2(sce->safe_areas.action, 10.0f / 100.0f, 5.0f / 100.0f);
copy_v2_fl2(sce->safe_areas.title, 10.0f / 100.0f, 5.0f / 100.0f);
copy_v2_fl2(sce->safe_areas.action, 3.5f / 100.0f, 3.5f / 100.0f);
copy_v2_fl2(sce->safe_areas.title_center, 17.5f / 100.0f, 5.0f / 100.0f);
copy_v2_fl2(sce->safe_areas.action_center, 15.0f / 100.0f, 5.0f / 100.0f);

2
source/blender/blenloader/intern/versioning_defaults.c
View File

@ -326,5 +326,7 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template)
for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
copy_v3_v3(scene->display.light_direction, (float[3]){M_SQRT1_3, M_SQRT1_3, M_SQRT1_3});
copy_v2_fl2(scene->safe_areas.title, 0.1f, 0.05f);
copy_v2_fl2(scene->safe_areas.action, 0.035f, 0.035f);
}
}

4
source/blender/makesrna/intern/rna_scene.c
View File

@ -5559,8 +5559,8 @@ static void rna_def_display_safe_areas(BlenderRNA *brna)
StructRNA *srna;
PropertyRNA *prop;
static float default_title[2] = {0.035f, 0.035f};
static float default_action[2] = {0.1f, 0.05f};
static float default_title[2] = {0.1f, 0.05f};
static float default_action[2] = {0.035f, 0.035f};
static float default_title_center[2] = {0.175f, 0.05f};
static float default_action_center[2] = {0.15f, 0.05f};