[Bf-blender-cvs] [570f3e67190] blender2.8: Object Mode: enable mode locking by default

[Campbell Barton]

Commit: 570f3e67190c24a1fc87c0aa4f6a3e71c8c773dd
Author: Campbell Barton
Date:   Wed Jun 20 10:18:53 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB570f3e67190c24a1fc87c0aa4f6a3e71c8c773dd

Object Mode: enable mode locking by default

This is meant to be default behavior for 2.8, see T55246

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

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

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

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index b1a0bde9746..4c81cb057f0 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -628,6 +628,8 @@ void BKE_scene_init(Scene *sce)
 	               CURVEMAP_SLOPE_POS_NEG);
 
 	sce->toolsettings = MEM_callocN(sizeof(struct ToolSettings), "Tool Settings Struct");
+
+	sce->toolsettings->object_flag |= SCE_OBJECT_MODE_LOCK;
 	sce->toolsettings->doublimit = 0.001;
 	sce->toolsettings->vgroup_weight = 1.0f;
 	sce->toolsettings->uvcalc_margin = 0.001f;
diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index a500c562e20..210dc07d7f2 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -141,6 +141,8 @@ void BLO_update_defaults_startup_blend(Main *bmain)
 		if (scene->toolsettings) {
 			ToolSettings *ts = scene->toolsettings;
 
+			ts->object_flag |= SCE_OBJECT_MODE_LOCK;
+
 			ts->uvcalc_flag |= UVCALC_TRANSFORM_CORRECT;
 
 			if (ts->sculpt) {
@@ -402,4 +404,3 @@ void BLO_update_defaults_startup_blend(Main *bmain)
 		}
 	}
 }
-