Merge branch 'master' into blender2.8

Conflicts:
	source/blender/editors/object/object_add.c
	source/blender/editors/object/object_select.c
	source/blender/editors/space_outliner/outliner_edit.c

1 files changed, 12 insertions, 12 deletions

diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index 764eaecd1e9..cbd6988655d 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -270,7 +270,7 @@ void BLO_update_defaults_startup_blend(Main *bmain)
 	{
 		Object *ob;
 
-		ob = (Object *)BKE_libblock_find_name_ex(bmain, ID_OB, "Camera");
+		ob = (Object *)BKE_libblock_find_name(bmain, ID_OB, "Camera");
 		if (ob) {
 			ob->rot[1] = 0.0f;
 		}
@@ -279,7 +279,7 @@ void BLO_update_defaults_startup_blend(Main *bmain)
 	{
 		Brush *br;
 
-		br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Fill");
+		br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Fill");
 		if (!br) {
 			br = BKE_brush_add(bmain, "Fill", OB_MODE_TEXTURE_PAINT);
 			id_us_min(&br->id);  /* fake user only */
@@ -288,14 +288,14 @@ void BLO_update_defaults_startup_blend(Main *bmain)
 		}
 
 		/* Vertex/Weight Paint */
-		br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Average");
+		br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Average");
 		if (!br) {
 			br = BKE_brush_add(bmain, "Average", OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT);
 			id_us_min(&br->id);  /* fake user only */
 			br->vertexpaint_tool = PAINT_BLEND_AVERAGE;
 			br->ob_mode = OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT;
 		}
-		br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Smear");
+		br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Smear");
 		if (!br) {
 			br = BKE_brush_add(bmain, "Smear", OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT);
 			id_us_min(&br->id);  /* fake user only */
@@ -303,49 +303,49 @@ void BLO_update_defaults_startup_blend(Main *bmain)
 			br->ob_mode = OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT;
 		}
 
-		br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Mask");
+		br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Mask");
 		if (br) {
 			br->imagepaint_tool = PAINT_TOOL_MASK;
 			br->ob_mode |= OB_MODE_TEXTURE_PAINT;
 		}
 
 		/* remove polish brush (flatten/contrast does the same) */
-		br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Polish");
+		br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Polish");
 		if (br) {
 			BKE_libblock_delete(bmain, br);
 		}
 
 		/* remove brush brush (huh?) from some modes (draw brushes do the same) */
-		br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Brush");
+		br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Brush");
 		if (br) {
 			BKE_libblock_delete(bmain, br);
 		}
 
 		/* remove draw brush from texpaint (draw brushes do the same) */
-		br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Draw");
+		br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Draw");
 		if (br) {
 			br->ob_mode &= ~OB_MODE_TEXTURE_PAINT;
 		}
 
 		/* rename twist brush to rotate brush to match rotate tool */
-		br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Twist");
+		br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Twist");
 		if (br) {
 			BKE_libblock_rename(bmain, &br->id, "Rotate");
 		}
 
 		/* use original normal for grab brush (otherwise flickers with normal weighting). */
-		br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Grab");
+		br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Grab");
 		if (br) {
 			br->flag |= BRUSH_ORIGINAL_NORMAL;
 		}
 
 		/* increase strength, better for smoothing method */
-		br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Blur");
+		br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Blur");
 		if (br) {
 			br->alpha = 1.0f;
 		}
 
-		br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Flatten/Contrast");
+		br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Flatten/Contrast");
 		if (br) {
 			br->flag |= BRUSH_ACCUMULATE;
 		}