diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-03-17 19:05:07 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-03-17 19:05:07 +0300 |
| commit | 56acbcaa0e5edd5ea0e9094253de982836989051 (patch) | |
| tree | 8254c25bd408b054eef7d874e6d9d2409e2b9677 /source/blender/editors | |
| parent | 16258ddd0372cc23db31033ea1555b83375e66d2 (diff) | |
Removed the now redundant "Read" toggle from cache libraries.
At this point the reading is toggled on the side of group duplicators.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 14 | ||||
| -rw-r--r-- | source/blender/editors/io/io_cache_library.c | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index c533c13a451..9494cf30f44 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -3770,14 +3770,12 @@ uiLayout *uiTemplateCacheLibraryItem(uiLayout *layout, bContext *C, CacheLibrary uiItemL(split, name, icon); /* display read result */ - if (cachelib->flag & CACHE_LIBRARY_READ) { - split = uiLayoutSplit(row, 0.9f, false); - if (item && (item->flag & CACHE_ITEM_ENABLED)) - RNA_enum_icon_from_value(cache_library_read_result_items, item->read_result, &icon); - else - icon = ICON_NONE; - uiItemL(split, NULL, icon); - } + split = uiLayoutSplit(row, 0.9f, false); + if (item && (item->flag & CACHE_ITEM_ENABLED)) + RNA_enum_icon_from_value(cache_library_read_result_items, item->read_result, &icon); + else + icon = ICON_NONE; + uiItemL(split, NULL, icon); return sub; } diff --git a/source/blender/editors/io/io_cache_library.c b/source/blender/editors/io/io_cache_library.c index 28f2fc9b218..bf5a743f31a 100644 --- a/source/blender/editors/io/io_cache_library.c +++ b/source/blender/editors/io/io_cache_library.c @@ -275,8 +275,9 @@ static void cache_library_bake_startjob(void *customdata, short *stop, short *do else { data->eval_ctx.mode = DAG_EVAL_RENDER; } + // TODO /* disable reading for the duration of the bake process */ - data->cachelib->flag &= ~CACHE_LIBRARY_READ; +// data->cachelib->flag |= CACHE_LIBRARY_BAKING; BKE_cache_archive_path(data->cachelib->filepath, (ID *)data->cachelib, data->cachelib->id.lib, filename, sizeof(filename)); data->archive = PTC_open_writer_archive(scene, filename); @@ -308,8 +309,9 @@ static void cache_library_bake_endjob(void *customdata) if (data->archive) PTC_close_writer_archive(data->archive); + // TODO /* enable reading */ - data->cachelib->flag |= CACHE_LIBRARY_READ; +// data->cachelib->flag &= ~CACHE_LIBRARY_BAKING; /* reset scene frame */ scene->r.cfra = data->origfra; |