diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-06-12 18:12:25 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-06-12 18:35:15 +0300 |
| commit | 24d53f79b217ff7c62e4c32a49967447a0230fef (patch) | |
| tree | bdc956af250dd44e72520f14f1db0c82c258432d /intern/cycles/render/nodes.h | |
| parent | 055001111e226e953b18c31deaacc2e1e7394f78 (diff) | |
Fix Cycles debug build assert on some platforms, tighten checks to avoid this in the future.
Diffstat (limited to 'intern/cycles/render/nodes.h')
| -rw-r--r-- | intern/cycles/render/nodes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h index a0c09f0807a..41894dce86a 100644 --- a/intern/cycles/render/nodes.h +++ b/intern/cycles/render/nodes.h @@ -87,7 +87,7 @@ public: int is_float; bool is_linear; bool use_alpha; - string filename; + ustring filename; void *builtin_data; NodeImageColorSpace color_space; NodeImageProjection projection; @@ -118,7 +118,7 @@ public: int is_float; bool is_linear; bool use_alpha; - string filename; + ustring filename; void *builtin_data; NodeImageColorSpace color_space; NodeEnvironmentProjection projection; |