diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-30 17:42:12 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-30 17:42:12 +0400 |
| commit | 452a52575cbc33551017d940ba86dda7a2c8c30b (patch) | |
| tree | 741538f4ed22dff243600017940958507fda3f98 /intern/cycles/render/nodes.h | |
| parent | 54223ed05b7e2840865b5e46ed6d43573ff2b4ae (diff) | |
Cycles material preview: fix for generated/packed/movie files
Issue was caused by cycles trying to find builtin images in a main
database and in case of preview render images are not in database,
they're just referenced by shader node tree.
Now builtin images in cycles have got void* pointer to store data
needed to load builtin images.
In case ob blender session, this pointer will store pointer from
PointerRNA for image datablock and used later to construct Image
class based on this pointer.
This also saves database lookup for final render which is nice :)
Reviewed by Brecht.
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 8b2d6a0e5c8..66be919d098 100644 --- a/intern/cycles/render/nodes.h +++ b/intern/cycles/render/nodes.h @@ -70,7 +70,7 @@ public: int slot; int is_float; string filename; - bool is_builtin; + void *builtin_data; ustring color_space; ustring projection; float projection_blend; @@ -90,7 +90,7 @@ public: int slot; int is_float; string filename; - bool is_builtin; + void *builtin_data; ustring color_space; ustring projection; bool animated; |