diff options
| author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2009-09-15 19:15:43 +0400 |
|---|---|---|
| committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2009-09-15 19:15:43 +0400 |
| commit | f7c686d0ae68842feddd4f37deadab12e1fa4991 (patch) | |
| tree | 52773e6d6236aec9a3a80bf6c5c1ea5f7e943224 /source/blender/render/intern/include/rendercore.h | |
| parent | f8657be654f89c6a4826ef8dd3e2275dfe2d4a5a (diff) | |
| parent | 0338b05a64184ce1a439a418ebc4e315185c1eec (diff) | |
svn merge -r 22571:22800 https://svn.blender.org/svnroot/bf-blender/trunk/blender
svn merge -r 22800:23207 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Merged volumetric with new raytrace code (it compiles and rendered volume-cube.blend withouth problems)
Part1:
source/blender
Diffstat (limited to 'source/blender/render/intern/include/rendercore.h')
| -rw-r--r-- | source/blender/render/intern/include/rendercore.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/render/intern/include/rendercore.h b/source/blender/render/intern/include/rendercore.h index 4b28529a147..250fbc000cb 100644 --- a/source/blender/render/intern/include/rendercore.h +++ b/source/blender/render/intern/include/rendercore.h @@ -95,6 +95,7 @@ int get_sample_layers(struct RenderPart *pa, struct RenderLayer *rl, struct Rend extern void freeraytree(Render *re); extern void makeraytree(Render *re); +RayObject* makeraytree_object(Render *re, ObjectInstanceRen *obi); extern void ray_shadow(ShadeInput *, LampRen *, float *); extern void ray_trace(ShadeInput *, ShadeResult *); |