[Bf-blender-cvs] [1601089ece8] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 1601089ece8a1f62c4c8d965fbef8073ccf0e0e5
Author: Campbell Barton
Date:   Thu Sep 7 14:49:55 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB1601089ece8a1f62c4c8d965fbef8073ccf0e0e5

Merge branch 'master' into blender2.8

This discards node drawing changes which need to be written as shaders.

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



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

diff --cc source/blender/editors/object/object_vgroup.c
index 58d93e46bde,19893c79db4..4c13c03d9b2
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@@ -3095,10 -3113,10 +3118,10 @@@ static int vertex_group_smooth_exec(bCo
  	int subset_count, vgroup_tot;
  
  	const bool *vgroup_validmap = BKE_object_defgroup_subset_from_select_type(ob, subset_type, &vgroup_tot, &subset_count);
- 	vgroup_smooth_subset(ob, vgroup_validmap, vgroup_tot, subset_count, fac, repeat, fac_expand, source);
+ 	vgroup_smooth_subset(ob, vgroup_validmap, vgroup_tot, subset_count, fac, repeat, fac_expand);
  	MEM_freeN((void *)vgroup_validmap);
  
 -	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
 +	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
  	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
  	WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);