Fix T59536: safe area values were swapped
authorJacques Lucke <mail@jlucke.com>
Tue, 18 Dec 2018 14:19:45 +0000 (15:19 +0100)
committerJacques Lucke <mail@jlucke.com>
Tue, 18 Dec 2018 14:20:42 +0000 (15:20 +0100)
Reviewers: brecht

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

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

index 3a9d22f559baccb2eb0e252e1c28a5776e6dcb8e..3de1ddb1e1e30c53842ce346c59c09056bce6074 100644 (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);
 
index f3ae1426fa880ea5f104d636811a48a0004d6148..e7c54bab33965c9e82b7107ed1f4c7ba5c3d168d 100644 (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);
        }
 }
index 037b16ab5df831d38ce75c20e7382cf14c7f9934..6719eaceaad62bbf223ef9c9a39e50db337ab939 100644 (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};