diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-06 13:25:33 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-06 13:25:33 +0300 |
| commit | ea606a7847a316a82b365155f666b33e81ff4c2e (patch) | |
| tree | d58158c83fd66000fbe9db0c45fa39b6fc02076e /intern/cycles/util | |
| parent | d7d32ad45217736c677edd22906d980d03aeb175 (diff) | |
| parent | 3df139c53062a141403ea9d359715ca3635c243c (diff) | |
Merge branch 'master' into blender28
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_defines.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/util/util_defines.h b/intern/cycles/util/util_defines.h index ae654092c87..98944a19022 100644 --- a/intern/cycles/util/util_defines.h +++ b/intern/cycles/util/util_defines.h @@ -30,7 +30,8 @@ # define ccl_device static inline # define ccl_device_noinline static # define ccl_global -# define ccl_constant +# define ccl_static_constant static const +# define ccl_constant const # define ccl_local # define ccl_local_param # define ccl_private |