diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-01-28 21:37:51 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-01-28 21:37:51 +0400 |
| commit | 5ac4b38a207ab7c40d50a0fe54cc41439ce82c63 (patch) | |
| tree | c0908b86645dc00559056e687afcc95cced92969 /source/blender/editors/datafiles | |
| parent | 74e5132d111ca3e24cc09b7e30b3bc35f71fdcfd (diff) | |
Cycles: preview rendering support for world/material/lamp.
Patch by Sergey, .blend by Thomas and some further tweaks by me.
Still to solve later: allow external engines to specify own preview .blend, for
now the code here is doing too much magic hacking on the preview scene still.
Diffstat (limited to 'source/blender/editors/datafiles')
| -rw-r--r-- | source/blender/editors/datafiles/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/editors/datafiles/SConscript | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index e9b33a6c2a6..ed3088696b1 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -43,6 +43,7 @@ if(WITH_BLENDER) # blends data_to_c_simple(../../../../release/datafiles/preview.blend SRC) + data_to_c_simple(../../../../release/datafiles/preview_cycles.blend SRC) # images data_to_c_simple(../../../../release/datafiles/splash.png SRC) diff --git a/source/blender/editors/datafiles/SConscript b/source/blender/editors/datafiles/SConscript index 49888d573a0..fb1f9f37975 100644 --- a/source/blender/editors/datafiles/SConscript +++ b/source/blender/editors/datafiles/SConscript @@ -46,6 +46,7 @@ sources.extend(( os.path.join(env['DATA_SOURCES'], "startup.blend.c"), os.path.join(env['DATA_SOURCES'], "preview.blend.c"), + os.path.join(env['DATA_SOURCES'], "preview_cycles.blend.c"), os.path.join(env['DATA_SOURCES'], "add.png.c"), os.path.join(env['DATA_SOURCES'], "blob.png.c"), |