Blender Git Loki
Git Commits -> Revision eb87529
Revision eb87529 by Brecht Van Lommel (master) November 3, 2012, 14:32 (GMT) |
Cycles OSL: shader script node Documentation here: http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/OSL http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.65/Cycles These changes require an OSL build from this repository: https://github.com/DingTo/OpenShadingLanguage The lib/ OSL has not been updated yet, so you might want to keep OSL disabled until that is done. Still todo: * Auto update for external .osl files not working currently, press update manually * Node could indicate better when a refresh is needed * Attributes like UV or generated coordinates may be missing when requested from an OSL shader, need a way to request them to be loaded by cycles * Expose string, enum and other non-socket parameters * Scons build support Thanks to Thomas, Lukas and Dalai for the implementation. |
Commit Details:
Full Hash: eb87529e23cdc744ed52b00f3de25e208b29d7f1
SVN Revision: 51838
Parent Commit: e02b23b
Lines Changed: +677, -109
1 Added Path:
/intern/cycles/blender/addon/osl.py (+124, -0) (View)
11 Modified Paths:
/intern/cycles/blender/addon/__init__.py (+8, -0) (Diff)
/intern/cycles/blender/blender_python.cpp (+176, -0) (Diff)
/intern/cycles/blender/blender_shader.cpp (+60, -7) (Diff)
/intern/cycles/blender/CMakeLists.txt (+1, -0) (Diff)
/intern/cycles/render/nodes.cpp (+20, -0) (Diff)
/intern/cycles/render/nodes.h (+12, -0) (Diff)
/intern/cycles/render/osl.cpp (+232, -98) (Diff)
/intern/cycles/render/osl.h (+20, -3) (Diff)
/intern/cycles/render/shader.h (+12, -0) (Diff)
/intern/cycles/util/util_path.cpp (+9, -1) (Diff)
/intern/cycles/util/util_path.h (+3, -0) (Diff)
/intern/cycles/blender/blender_python.cpp (+176, -0) (Diff)
/intern/cycles/blender/blender_shader.cpp (+60, -7) (Diff)
/intern/cycles/blender/CMakeLists.txt (+1, -0) (Diff)
/intern/cycles/render/nodes.cpp (+20, -0) (Diff)
/intern/cycles/render/nodes.h (+12, -0) (Diff)
/intern/cycles/render/osl.cpp (+232, -98) (Diff)
/intern/cycles/render/osl.h (+20, -3) (Diff)
/intern/cycles/render/shader.h (+12, -0) (Diff)
/intern/cycles/util/util_path.cpp (+9, -1) (Diff)
/intern/cycles/util/util_path.h (+3, -0) (Diff)