[Bf-blender-cvs] [d9eea0b27d7] soc-2016-pbvh-painting: Merge branch 'master' into soc-2016-pbvh-painting

[Campbell Barton]

Commit: d9eea0b27d7d9ffb166a2330f6aa6fb4705fe438
Author: Campbell Barton
Date:   Wed Sep 27 10:15:41 2017 +1000
Branches: soc-2016-pbvh-painting
https://developer.blender.org/rBd9eea0b27d7d9ffb166a2330f6aa6fb4705fe438

Merge branch 'master' into soc-2016-pbvh-painting

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



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

diff --cc source/blender/blenkernel/intern/pbvh.c
index d2c7ba78f17,53dfffe2b97..6fee135b274
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@@ -1159,9 -1156,9 +1161,9 @@@ static void pbvh_update_draw_buffers(PB
  	}
  }
  
 -static void pbvh_draw_BB(PBVH *bvh)
 +void BKE_pbvh_draw_BB(PBVH *bvh)
  {
- 	GPU_init_draw_pbvh_BB();
+ 	GPU_pbvh_BB_draw_init();
  
  	for (int a = 0; a < bvh->totnode; a++) {
  		PBVHNode *node = &bvh->nodes[a];
diff --cc source/blender/blenloader/intern/versioning_270.c
index a8d2a01acd7,f87d04fa0a3..808914459fe
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1611,22 -1652,35 +1653,53 @@@ void blo_do_versions_270(FileData *fd, 
  			}
  		}
  
+ 		FOREACH_NODETREE(main, ntree, id) {
+ 			if (ntree->type == NTREE_COMPOSIT) {
+ 				do_versions_compositor_render_passes(ntree);
+ 			}
+ 		} FOREACH_NODETREE_END
+ 	}
+ 
+ 	if (!MAIN_VERSION_ATLEAST(main, 279, 0)) {
+ 		for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+ 			if (scene->r.im_format.exr_codec == R_IMF_EXR_CODEC_DWAB) {
+ 				scene->r.im_format.exr_codec = R_IMF_EXR_CODEC_DWAA;
+ 			}
+ 		}
+ 
+ 		/* Fix related to VGroup modifiers creating named defgroup CD layers! See T51520. */
+ 		for (Mesh *me = main->mesh.first; me; me = me->id.next) {
+ 			CustomData_set_layer_name(&me->vdata, CD_MDEFORMVERT, 0, "");
+ 		}
+ 	}
+ 
+ 	{
+ 		/* Fix for invalid state of screen due to bug in older versions. */
+ 		for (bScreen *sc = main->screen.first; sc; sc = sc->id.next) {
+ 			for (ScrArea *sa = sc->areabase.first; sa; sa = sa->next) {
+ 				if(sa->full && sc->state == SCREENNORMAL) {
+ 					sa->full = NULL;
+ 				}
+ 			}
+ 		}
++
 +		{
 +			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;
 +			}
 +		}
++
  	}
  }