diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-12 13:02:46 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-12 13:02:46 +0300 |
| commit | a0022f80f4b028fc977922eee7d3d3e188916c11 (patch) | |
| tree | e28afcfe00b830387dcad0f0d75b3969323f376a /intern | |
| parent | b6ad300a13f5956dcaa970fd0534d04eba1ccbbd (diff) | |
| parent | e732c6af3bb5b5746c9232377ae2a4fd1178e752 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/util/util_stack_allocator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/util/util_stack_allocator.h b/intern/cycles/util/util_stack_allocator.h index 6b52e73ee4e..4e978e18bee 100644 --- a/intern/cycles/util/util_stack_allocator.h +++ b/intern/cycles/util/util_stack_allocator.h @@ -164,4 +164,4 @@ private: CCL_NAMESPACE_END -#endif /* __UTIL_GUARDED_ALLOCATOR_H__ */ +#endif /* __UTIL_STACK_ALLOCATOR_H__ */ |