diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-08-14 10:51:18 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-14 10:51:18 +0400 |
| commit | 2f5e10f7b81ed2e270be8a21ccf356311caabd51 (patch) | |
| tree | 5127603993f6e46f8ffa5638ab2ace7edfb9c760 /intern/cycles | |
| parent | 43c21e91e1efaaa275f5597b01c0729601a9d7ea (diff) | |
include order change for osl, fixes gcc compile error - undefined uintptr_t
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_closures.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/intern/cycles/kernel/osl/osl_closures.h b/intern/cycles/kernel/osl/osl_closures.h index 17d7260c191..ca5f441aa2d 100644 --- a/intern/cycles/kernel/osl/osl_closures.h +++ b/intern/cycles/kernel/osl/osl_closures.h @@ -33,14 +33,13 @@ #ifndef __OSL_CLOSURES_H__ #define __OSL_CLOSURES_H__ +#include "util_types.h" +#include "kernel_types.h" + #include <OSL/oslclosure.h> #include <OSL/oslexec.h> #include <OSL/genclosure.h> -#include "kernel_types.h" - -#include "util_types.h" - CCL_NAMESPACE_BEGIN OSL::ClosureParam *closure_emission_params(); |