diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-15 16:44:36 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-22 12:13:33 +0300 |
| commit | 05306d97663b4281d4b17bfc7e1ed913ce07966f (patch) | |
| tree | 4c3ed1c62684c317ded5217cf4f40b4589d395dc /source/blender/blenkernel | |
| parent | f15c63b0c2216fdebe559a0ed0f93765e6e763dc (diff) | |
SceneRenderLayer > SceneLayer: Convert material_override
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_layer.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/layer.c | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/library_query.c | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h index 38cecdc3e0f..ad2f196866f 100644 --- a/source/blender/blenkernel/BKE_layer.h +++ b/source/blender/blenkernel/BKE_layer.h @@ -108,7 +108,7 @@ void BKE_layer_sync_object_unlink(const struct Scene *scene, struct SceneCollect /* override */ -void BKE_collection_override_datablock_add(struct LayerCollection *lc, const char *data_path, struct ID *id); +void BKE_override_scene_layer_datablock_add(struct SceneLayer *scene_layer, int id_type, const char *data_path, const struct ID *id); /* engine settings */ typedef void (*EngineSettingsCB)(struct RenderEngine *engine, struct IDProperty *props); diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index c6ee00c5839..3c9c110625b 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -1060,8 +1060,9 @@ void BKE_layer_sync_object_unlink(const Scene *scene, SceneCollection *sc, Objec /** * Add a new datablock override */ -void BKE_collection_override_datablock_add(LayerCollection *UNUSED(lc), const char *UNUSED(data_path), ID *UNUSED(id)) +void BKE_override_scene_layer_datablock_add(SceneLayer *scene_layer, int id_type, const char *data_path, const ID *id) { + UNUSED_VARS(scene_layer, id_type, data_path, id); TODO_LAYER_OVERRIDE; } diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c index b00dc54d08a..b6f1b6529e9 100644 --- a/source/blender/blenkernel/intern/library_query.c +++ b/source/blender/blenkernel/intern/library_query.c @@ -425,9 +425,6 @@ void BKE_library_foreach_ID_link(Main *bmain, ID *id, LibraryIDLinkCallback call FreestyleModuleConfig *fmc; FreestyleLineSet *fls; - if (srl->mat_override) { - CALLBACK_INVOKE(srl->mat_override, IDWALK_CB_USER); - } for (fmc = srl->freestyleConfig.modules.first; fmc; fmc = fmc->next) { if (fmc->script) { CALLBACK_INVOKE(fmc->script, IDWALK_CB_NOP); |