diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-09 16:34:33 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-09 16:34:33 +0300 |
| commit | 78a6689aea1976d42ba0fca927f3e7572768e1fb (patch) | |
| tree | 5c16e6461f82c00ebef4906f748dba2dc360e80f /intern/cycles/blender/blender_session.h | |
| parent | 6c10ec74d5ec3d6fbbc1531463c117332b91ebed (diff) | |
| parent | ddabb21d0584e9874e8e5c62c04abe496ec7334b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/blender/blender_session.h')
| -rw-r--r-- | intern/cycles/blender/blender_session.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_session.h b/intern/cycles/blender/blender_session.h index c83d3ee9aa3..5db71873946 100644 --- a/intern/cycles/blender/blender_session.h +++ b/intern/cycles/blender/blender_session.h @@ -179,4 +179,4 @@ protected: CCL_NAMESPACE_END -#endif /* __BLENDER_SESSION_H__ */ +#endif /* __BLENDER_SESSION_H__ */ |