diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-28 20:37:05 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-28 20:59:33 +0300 |
commit | 3f4e3f718fdc1163cc52a84d85978fa94b230211 (patch) | |
tree | 21bdaae3f63721ac481493a58d9abd37395243ce /source/blender/blenkernel/intern | |
parent | a7c5f4f20657e12b43337e32bc62a876cbbe6292 (diff) |
Cycles: restore old sample and material override settings for view layers.
Since there will be no view layer overrides in 2.80, this is needed still.
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/layer.c | 33 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/library_query.c | 2 |
2 files changed, 2 insertions, 33 deletions
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index 3fedd380f72..572dba4d83b 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -1057,39 +1057,6 @@ bool BKE_scene_has_object(Scene *scene, Object *ob) return false; } -/* ---------------------------------------------------------------------- */ -/* Override */ - -/** - * Add a new datablock override - */ -void BKE_override_view_layer_datablock_add( - ViewLayer *view_layer, int id_type, const char *data_path, const ID *owner_id) -{ - UNUSED_VARS(view_layer, id_type, data_path, owner_id); - TODO_LAYER_OVERRIDE; -} - -/** - * Add a new int override - */ -void BKE_override_view_layer_int_add( - ViewLayer *view_layer, int id_type, const char *data_path, const int value) -{ - UNUSED_VARS(view_layer, id_type, data_path, value); - TODO_LAYER_OVERRIDE; -} - -/** - * Add a new boolean override - */ -void BKE_override_layer_collection_boolean_add( - struct LayerCollection *layer_collection, int id_type, const char *data_path, const bool value) -{ - UNUSED_VARS(layer_collection, id_type, data_path, value); - TODO_LAYER_OVERRIDE; -} - /** \} */ /* Iterators */ diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c index ab50cf8b0a8..2134c02b63d 100644 --- a/source/blender/blenkernel/intern/library_query.c +++ b/source/blender/blenkernel/intern/library_query.c @@ -438,6 +438,8 @@ void BKE_library_foreach_ID_link(Main *bmain, ID *id, LibraryIDLinkCallback call ViewLayer *view_layer; for (view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) { + CALLBACK_INVOKE(view_layer->mat_override, IDWALK_CB_USER); + for (Base *base = view_layer->object_bases.first; base; base = base->next) { CALLBACK_INVOKE(base->object, IDWALK_CB_NOP); } |