Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Thu, 25 Jan 2018 13:31:54 +0000 (11:31 -0200)
committerDalai Felinto <dfelinto@gmail.com>
Thu, 25 Jan 2018 13:31:54 +0000 (11:31 -0200)
1  2 
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/addon/version_update.py
source/blender/editors/gpencil/gpencil_edit.c
source/blender/editors/render/render_shading.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/render_result.c

Simple merge
index c105fe9036a75c73c08986de1d0b64e3f9d6bb3f,73d84e24794341b7007de9047136191a9b29fe58..ec334c715553ee3c2b4ccb836403dc43da78eced
@@@ -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'
index 6fdbe5e88a2ec203f5734a9feedd666e2aa8109d,49d74c2563364cf3106477fbef031985863756f6..270ba2a7947abedf8fb3c808990945909fbb6d84
@@@ -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;
  }