diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2017-06-09 18:16:39 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2017-06-09 18:17:28 +0300 |
commit | 2bb004e03d11e7d7a0f930ecad66c1d3b744eb39 (patch) | |
tree | bb5ca923e1a5b6f88ceec1dd131b01925dcb6ff1 /source/blender/editors/include/ED_scene.h | |
parent | f35df9a25adec35a384ba45c5b2b2d5767e7e87d (diff) |
Fix crash when deleting active workspace render-layer
Also fixes some failing unit-tests for render-layers.
Diffstat (limited to 'source/blender/editors/include/ED_scene.h')
-rw-r--r-- | source/blender/editors/include/ED_scene.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/editors/include/ED_scene.h b/source/blender/editors/include/ED_scene.h index 2f67f7befae..6a4ebf68d3d 100644 --- a/source/blender/editors/include/ED_scene.h +++ b/source/blender/editors/include/ED_scene.h @@ -29,11 +29,14 @@ enum eSceneCopyMethod; -struct Scene *ED_scene_add(struct Main *bmain, bContext *C, struct wmWindow *win, enum eSceneCopyMethod method) ATTR_NONNULL(); -bool ED_scene_delete(bContext *C, struct Main *bmain, struct wmWindow *win, struct Scene *scene) ATTR_NONNULL(); -void ED_scene_exit(bContext *C) ATTR_NONNULL(); -void ED_scene_changed_update(struct Main *bmain, bContext *C, struct Scene *scene_new, +struct Scene *ED_scene_add(struct Main *bmain, struct bContext *C, struct wmWindow *win, enum eSceneCopyMethod method) ATTR_NONNULL(); +bool ED_scene_delete(struct bContext *C, struct Main *bmain, struct wmWindow *win, struct Scene *scene) ATTR_NONNULL(); +void ED_scene_exit(struct bContext *C) ATTR_NONNULL(); +void ED_scene_changed_update(struct Main *bmain, struct bContext *C, struct Scene *scene_new, const struct bScreen *active_screen) ATTR_NONNULL(); +bool ED_scene_render_layer_delete( + struct Main *bmain, struct Scene *scene, struct SceneLayer *layer, + struct ReportList *reports) ATTR_NONNULL(1, 2, 3); void ED_operatortypes_scene(void); |