[Bf-blender-cvs] [5659d8bc0aa] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 5659d8bc0aa334aee20f29548e048f3002f1cff6
Author: Campbell Barton
Date:   Wed May 2 14:40:00 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB5659d8bc0aa334aee20f29548e048f3002f1cff6

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenkernel/intern/paint.c
index 4056a15fe47,144ec029db1..a63777dd5ad
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@@ -214,7 -209,7 +214,8 @@@ Paint *BKE_paint_get_active_from_contex
  			}
  		}
  		else {
- 			return BKE_paint_get_active(sce, view_layer);
 -			return BKE_paint_get_active(sce);
++			/* default to image paint */
++			return &ts->imapaint.paint;
  		}
  	}