[Bf-blender-cvs] [748adb37e5a] blender2.8: Merge remote-tracking branch 'origin/master' into blender2.8

[Dalai Felinto]

Commit: 748adb37e5a0c4de136fae64e9b1aa41defee3cf
Author: Dalai Felinto
Date:   Thu Jan 25 11:31:54 2018 -0200
Branches: blender2.8
https://developer.blender.org/rB748adb37e5a0c4de136fae64e9b1aa41defee3cf

Merge remote-tracking branch 'origin/master' into blender2.8

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



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

diff --cc intern/cycles/blender/addon/version_update.py
index c105fe9036a,73d84e24794..ec334c71555
--- a/intern/cycles/blender/addon/version_update.py
+++ b/intern/cycles/blender/addon/version_update.py
@@@ -357,6 -357,11 +357,12 @@@ def do_versions(self)
              if not cscene.is_property_set("sample_clamp_indirect"):
                  cscene.sample_clamp_indirect = 0.0
  
 -    if bpy.data.version <= (2, 79, 1):
 +    if bpy.data.version <= (2, 79, 1) or \
 +       (bpy.data.version >= (2, 80, 0) and bpy.data.version <= (2, 80, 3)):
          displacement_nodes_insert()
+ 
+     if bpy.data.version <= (2, 79, 2):
+         for mat in bpy.data.materials:
+             cmat = mat.cycles
+             if not cmat.is_property_set("displacement_method"):
+                 cmat.displacement_method = 'BUMP'
diff --cc source/blender/editors/render/render_shading.c
index 6fdbe5e88a2,49d74c25633..270ba2a7947
--- a/source/blender/editors/render/render_shading.c
+++ b/source/blender/editors/render/render_shading.c
@@@ -426,8 -424,9 +426,9 @@@ static int material_slot_move_exec(bCon
  
  	MEM_freeN(slot_remap);
  
 -	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 | ND_DATA, ob);
+ 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
+ 	WM_event_add_notifier(C, NC_OBJECT | ND_DATA, ob);
  
  	return OPERATOR_FINISHED;
  }