diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-03 15:44:47 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-03 15:44:47 +0300 |
| commit | be403891652a375e5a0ac61b493342ca6d39afb7 (patch) | |
| tree | ef9637103db6d66c4b311cba5b705d575562a1f8 /intern/cycles/render/image.h | |
| parent | 060fdb49d64857ff1cbf9937420ed70b10b17086 (diff) | |
| parent | cbc7aa80d49e3b36c9ecc0e27ec528b34c491fc1 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/render/image.h')
| -rw-r--r-- | intern/cycles/render/image.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h index cc7c8544bed..3519a67bc05 100644 --- a/intern/cycles/render/image.h +++ b/intern/cycles/render/image.h @@ -111,6 +111,7 @@ public: InterpolationType interpolation; ExtensionType extension; + string mem_name; device_memory *mem; int users; |