Blender Git Loki
Git Commits -> Revision 452a525
Revision 452a525 by Sergey Sharybin (master) January 30, 2013, 13:42 (GMT) |
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. |
Commit Details:
Full Hash: 452a52575cbc33551017d940ba86dda7a2c8c30b
SVN Revision: 54205
Parent Commit: 54223ed
Lines Changed: +61, -64
7 Modified Paths:
/intern/cycles/blender/blender_session.cpp (+20, -24) (Diff)
/intern/cycles/blender/blender_session.h (+4, -4) (Diff)
/intern/cycles/blender/blender_shader.cpp (+4, -3) (Diff)
/intern/cycles/render/image.cpp (+16, -16) (Diff)
/intern/cycles/render/image.h (+7, -7) (Diff)
/intern/cycles/render/nodes.cpp (+8, -8) (Diff)
/intern/cycles/render/nodes.h (+2, -2) (Diff)
/intern/cycles/blender/blender_session.h (+4, -4) (Diff)
/intern/cycles/blender/blender_shader.cpp (+4, -3) (Diff)
/intern/cycles/render/image.cpp (+16, -16) (Diff)
/intern/cycles/render/image.h (+7, -7) (Diff)
/intern/cycles/render/nodes.cpp (+8, -8) (Diff)
/intern/cycles/render/nodes.h (+2, -2) (Diff)