[Bf-blender-cvs] [64afba0244c] master: Remove brush versioning (again!)

[Campbell Barton]

Commit: 64afba0244c28050c26466cfff3cfe31771a6a80
Author: Campbell Barton
Date:   Tue Oct 3 00:53:42 2017 +1100
Branches: master
https://developer.blender.org/rB64afba0244c28050c26466cfff3cfe31771a6a80

Remove brush versioning (again!)

Causes crash, see c133927bb

Merging soc-2017-vertex_paint brought this back by accident.

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

M	source/blender/blenloader/intern/versioning_270.c

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

diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index b374e49fc83..d40dbd542dd 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -1653,23 +1653,6 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 			}
 		}
 
-		{
-			Brush *br;
-			br = (Brush *)BKE_libblock_find_name_ex(main, ID_BR, "Average");
-			if (!br) {
-				br = BKE_brush_add(main, "Average", OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT);
-				br->vertexpaint_tool = PAINT_BLEND_AVERAGE;
-				br->ob_mode = OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT;
-			}
-
-			br = (Brush *)BKE_libblock_find_name_ex(main, ID_BR, "Smear");
-			if (!br) {
-				br = BKE_brush_add(main, "Smear", OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT);
-				br->vertexpaint_tool = PAINT_BLEND_SMEAR;
-				br->ob_mode = OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT;
-			}
-		}
-
 		FOREACH_NODETREE(main, ntree, id) {
 			if (ntree->type == NTREE_COMPOSIT) {
 				do_versions_compositor_render_passes(ntree);