diff options
author | Jacques Lucke <mail@jlucke.com> | 2018-12-18 17:19:45 +0300 |
---|---|---|
committer | Jacques Lucke <mail@jlucke.com> | 2018-12-18 17:20:42 +0300 |
commit | 5fa749ace29a60c1b0dd596c42973ac5e5cea28e (patch) | |
tree | e256183197d49f2e65714d98145f5b65e0071bba /source | |
parent | 37c2382a49ee47974d588ea363d87d5e81b1a4df (diff) |
Fix T59536: safe area values were swapped
Reviewers: brecht
Differential Revision: https://developer.blender.org/D4097
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/scene.c | 4 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_defaults.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 3a9d22f559b..3de1ddb1e1e 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -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); diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c index f3ae1426fa8..e7c54bab339 100644 --- a/source/blender/blenloader/intern/versioning_defaults.c +++ b/source/blender/blenloader/intern/versioning_defaults.c @@ -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); } } diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 037b16ab5df..6719eaceaad 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -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}; |