Rename any instance of scene layer or render layer in code with view layer
[blender.git] / source / blender / render / intern / include / render_types.h
index 1de1f23f35142478f8f95d007c1b02e7a4e7ed35..d24aae6ac97d10c4f55954ba5da538ebb0b38739 100644 (file)
@@ -118,7 +118,8 @@ typedef struct RenderPart {
 enum {
        PART_STATUS_NONE        = 0,
        PART_STATUS_IN_PROGRESS = 1,
-       PART_STATUS_READY       = 2
+       PART_STATUS_RENDERED    = 2,
+       PART_STATUS_MERGED      = 3
 };
 
 /* controls state of render, everything that's read-only during render stage */
@@ -191,7 +192,10 @@ struct Render {
        struct Main *main;
        Scene *scene;
        RenderData r;
+       ListBase view_layers;
+       int active_view_layer;
        World wrld;
+       ViewRender view_render;
        struct Object *camera_override;
        unsigned int lay, layer_override;