diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-10 11:58:05 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-10 11:58:05 +0300 |
| commit | 2b56faebe5f2a8e2b37004485206007d22cdac1d (patch) | |
| tree | f96042f4c8f9b9c06b3b9f694d207f1bc62a5a5c /source/blender/blenkernel/intern/image.c | |
| parent | 5ff33ecdf0ed319db2e589926a614f67738531a6 (diff) | |
| parent | 18f53d8822518928baceab1407eac195ab9bf817 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 59fadffe22a..dbb596b1cd6 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -113,9 +113,9 @@ static void image_add_view(Image *ima, const char *viewname, const char *filepat /* quick lookup: supports 1 million frames, thousand passes */ #define IMA_MAKE_INDEX(frame, index) (((frame) << 10) + (index)) #define IMA_INDEX_FRAME(index) ((index) >> 10) -/* +#if 0 #define IMA_INDEX_PASS(index) (index & ~1023) -*/ +#endif /* ******** IMAGE CACHE ************* */ |