diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-06 11:18:52 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-06 11:18:52 +0300 |
| commit | de777ad9e69320500bf05d97a7d6d60ba4fd0a93 (patch) | |
| tree | a1141843a3e1df137bbc6490641bedf12a12a8fa /intern/cycles/render/image.h | |
| parent | 6d38d824377c55aaaed7e8283e81a7128bf6f728 (diff) | |
| parent | 1daa20ad9f6f0c433a4e0a97a74e5beb9ea4e2c7 (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, 0 insertions, 1 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h index 59b9f9ea28d..c9667fb77a9 100644 --- a/intern/cycles/render/image.h +++ b/intern/cycles/render/image.h @@ -171,4 +171,3 @@ private: CCL_NAMESPACE_END #endif /* __IMAGE_H__ */ - |