[Bf-blender-cvs] [5fa749ace29] blender2.8: Fix T59536: safe area values were swapped

[Jacques Lucke]

Commit: 5fa749ace29a60c1b0dd596c42973ac5e5cea28e
Author: Jacques Lucke
Date:   Tue Dec 18 15:19:45 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB5fa749ace29a60c1b0dd596c42973ac5e5cea28e

Fix T59536: safe area values were swapped

Reviewers: brecht

Differential Revision: https://developer.blender.org/D4097

===================================================================

M	source/blender/blenkernel/intern/scene.c
M	source/blender/blenloader/intern/versioning_defaults.c
M	source/blender/makesrna/intern/rna_scene.c

===================================================================

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};