Commit: 4c416aea3bd2d4b5e05c33b90f7b79e04f4da318
Author: Clément Foucault
Date: Thu Jan 26 19:49:09 2017 +0100
Branches: clay-engine
https://developer.blender.org/rB4c416aea3bd2d4b5e05c33b90f7b79e04f4da318
Merge branch 'render-layers' of git.blender.org:blender into clay-engine
# Conflicts:
# source/blender/makesdna/DNA_scene_types.h
===================================================================
===================================================================
diff --cc source/blender/makesdna/DNA_scene_types.h
index 08366af628,cb267002a5..3759aa3d48
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@@ -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 ********************* */
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
