Merge branch 'render-layers' of git.blender.org:blender into clay-engine
authorClément Foucault <foucault.clem@gmail.com>
Thu, 26 Jan 2017 18:49:09 +0000 (19:49 +0100)
committerClément Foucault <foucault.clem@gmail.com>
Thu, 26 Jan 2017 18:49:09 +0000 (19:49 +0100)
# Conflicts:
# source/blender/makesdna/DNA_scene_types.h

1  2 
source/blender/blenloader/intern/versioning_280.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c

index 08366af628cf5e7d15ff3f9fcd09d4ddad90f45c,cb267002a5fc1f19bdd6f04be3e98289c14b3257..3759aa3d48b6b57285fa9c525f269b7b4dc9ea41
@@@ -1751,10 -1711,8 +1751,12 @@@ typedef struct Scene 
  
        ListBase render_layers;
        struct SceneCollection *collection;
+       int active_layer;
+       int pad4;
 +
 +      /* Engine Settings */
 +      struct EngineDataClay claydata;
 +      short pad10[4];
  } Scene;
  
  /* **************** RENDERDATA ********************* */