diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-05-03 16:09:09 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-05-05 16:54:43 +0300 |
| commit | b365cc017adf3a8fb36006d6cb194d28be02e6d4 (patch) | |
| tree | 9707a02b1ce75c285d731f41a9d49d2ec52dcad8 /source/blender/blenkernel/BKE_layer.h | |
| parent | 2094b454474de25e42cd6ec1f63ebc84f50f666a (diff) | |
3D Viewport: move overlay settings from collections to 3D viewport.
For some we may add per object overrides, but for most we plan to keep them
strictly per viewport settings. Display settings from the mesh still need to
be moved here, only collections were done to remove that code.
Diffstat (limited to 'source/blender/blenkernel/BKE_layer.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_layer.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h index 27e3d32a510..5c84dbf160e 100644 --- a/source/blender/blenkernel/BKE_layer.h +++ b/source/blender/blenkernel/BKE_layer.h @@ -135,18 +135,18 @@ void BKE_override_layer_collection_boolean_add(struct LayerCollection *layer_col /* engine settings */ typedef void (*EngineSettingsCB)(struct RenderEngine *engine, struct IDProperty *props); -struct IDProperty *BKE_layer_collection_engine_evaluated_get(struct Object *ob, const int type, const char *engine_name); -struct IDProperty *BKE_layer_collection_engine_collection_get(struct LayerCollection *lc, const int type, const char *engine_name); -struct IDProperty *BKE_layer_collection_engine_scene_get(struct Scene *scene, const int type, const char *engine_name); +struct IDProperty *BKE_layer_collection_engine_evaluated_get(struct Object *ob, const char *engine_name); +struct IDProperty *BKE_layer_collection_engine_collection_get(struct LayerCollection *lc, const char *engine_name); +struct IDProperty *BKE_layer_collection_engine_scene_get(struct Scene *scene, const char *engine_name); void BKE_layer_collection_engine_settings_callback_register(struct Main *bmain, const char *engine_name, EngineSettingsCB func); void BKE_layer_collection_engine_settings_callback_free(void); void BKE_layer_collection_engine_settings_create(struct IDProperty *root); void BKE_layer_collection_engine_settings_validate_scene(struct Scene *scene); void BKE_layer_collection_engine_settings_validate_collection(struct LayerCollection *lc); -struct IDProperty *BKE_view_layer_engine_evaluated_get(struct ViewLayer *view_layer, const int type, const char *engine_name); -struct IDProperty *BKE_view_layer_engine_layer_get(struct ViewLayer *view_layer, const int type, const char *engine_name); -struct IDProperty *BKE_view_layer_engine_scene_get(struct Scene *scene, const int type, const char *engine_name); +struct IDProperty *BKE_view_layer_engine_evaluated_get(struct ViewLayer *view_layer, const char *engine_name); +struct IDProperty *BKE_view_layer_engine_layer_get(struct ViewLayer *view_layer, const char *engine_name); +struct IDProperty *BKE_view_layer_engine_scene_get(struct Scene *scene, const char *engine_name); void BKE_view_layer_engine_settings_callback_register(struct Main *bmain, const char *engine_name, EngineSettingsCB func); void BKE_view_layer_engine_settings_callback_free(void); void BKE_view_layer_engine_settings_validate_scene(struct Scene *scene); |