diff options
| author | Jacques Lucke <mail@jlucke.com> | 2018-10-18 16:43:06 +0300 |
|---|---|---|
| committer | Jacques Lucke <mail@jlucke.com> | 2018-10-18 16:43:06 +0300 |
| commit | 41216d5ad4c722e2ad9f15c968af454fc7566d5e (patch) | |
| tree | f68fe3e1dd32a2d651b6678a1783e165ce2e70c8 /source/blender/blenkernel/intern/image.c | |
| parent | cfdd902d2d5d560262d1218861ad1a4469c5259f (diff) | |
Cleanup: Remove more #if 0 blocks
Continuation of https://developer.blender.org/D3802
Reviewers: brecht
Differential Revision: https://developer.blender.org/D3808
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index b7885e08a60..723d485ea0f 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -2670,11 +2670,6 @@ void BKE_image_signal(Main *bmain, Image *ima, ImageUser *iuser, int signal) ima->name[0] = '\0'; } -#if 0 - /* force reload on first use, but not for multilayer, that makes nodes and buttons in ui drawing fail */ - if (ima->type != IMA_TYPE_MULTILAYER) - BKE_image_free_buffers(ima); -#else /* image buffers for non-sequence multilayer will share buffers with RenderResult, * however sequence multilayer will own buffers. Such logic makes switching from * single multilayer file to sequence completely unstable @@ -2683,7 +2678,6 @@ void BKE_image_signal(Main *bmain, Image *ima, ImageUser *iuser, int signal) * sequences behave stable */ BKE_image_free_buffers(ima); -#endif ima->ok = 1; if (iuser) @@ -4468,15 +4462,6 @@ bool BKE_image_is_dirty(Image *image) void BKE_image_file_format_set(Image *image, int ftype, const ImbFormatOptions *options) { -#if 0 - ImBuf *ibuf = BKE_image_acquire_ibuf(image, NULL, NULL); - if (ibuf) { - ibuf->ftype = ftype; - ibuf->foptions = options; - } - BKE_image_release_ibuf(image, ibuf, NULL); -#endif - BLI_spin_lock(&image_spin); if (image->cache != NULL) { struct MovieCacheIter *iter = IMB_moviecacheIter_new(image->cache); |