diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-11-02 16:37:10 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-11-02 16:37:10 +0300 |
| commit | f7d59fbc460cd2e544c855d8088c98aacf90cfdd (patch) | |
| tree | 81ed5a9b6996845aee4ee48b3febf0c696f2f2be /source/blender/render/intern/include/render_types.h | |
| parent | 7eb4ef6cacbb4cf0fbc2ff01d2e1a5fa133072cf (diff) | |
| parent | 8a3728800cac83a0a9e524790ff46b7eca82cfbd (diff) | |
Merge branch 'master' into blender2.8
# Conflicts:
# tests/gtests/alembic/abc_export_test.cc
Diffstat (limited to 'source/blender/render/intern/include/render_types.h')
| -rw-r--r-- | source/blender/render/intern/include/render_types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index c97832f32c5..ec5bb2c9376 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -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 */ |