Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Tue, 15 Aug 2017 11:02:45 +0000 (13:02 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Tue, 15 Aug 2017 11:02:45 +0000 (13:02 +0200)
# Conflicts:
# source/blender/makesrna/intern/rna_render.c

1  2 
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_sync.cpp
release/scripts/startup/bl_ui/properties_render.py
source/blender/alembic/intern/abc_mesh.cc
source/blender/blenkernel/BKE_scene.h
source/blender/blenkernel/intern/scene.c
source/blender/editors/render/render_internal.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_render.c
source/blender/makesrna/intern/rna_scene.c

Simple merge
Simple merge
index 725aa7853323b3e1ae91f9a4240031bbb1ef5721,a66c160ed1a3ebbb9491891db8098d45f6e5edb8..7bcf116d6b770dbb932e1d5de0148f13502384c8
  #include "BLI_utildefines.h"
  #include "BLI_path_util.h"
  
 +#include "DEG_depsgraph.h"
 +
+ #include "BKE_scene.h"
  #include "RNA_define.h"
  #include "RNA_enum_types.h"
  
index b9ab2968e066573bd5dba0cf3a11ed8f1d34f366,71350edeb9477c9fe42dec8d3bb102990675acd4..2975c318d66d07a29281283868da3e4d0fe16148
@@@ -1885,6 -1846,13 +1885,13 @@@ static void rna_Scene_simplify_update(M
                rna_Scene_use_simplify_update(bmain, sce, ptr);
  }
  
 -      DAG_id_tag_update(&sce->id, 0);
+ static void rna_SceneRenderData_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
+ {
+       Scene *sce = ptr->id.data;
++      DEG_id_tag_update(&sce->id, 0);
+ }
  static void rna_Scene_use_persistent_data_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
  {
        Scene *sce = ptr->id.data;