diff options
author | Ton Roosendaal <ton@blender.org> | 2006-11-29 20:01:09 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2006-11-29 20:01:09 +0300 |
commit | 6543d3e220a8e481eebe73f67dccaf9e752cef22 (patch) | |
tree | 8596ec3249e102cf2a73d23216d06cfd46a70b46 /source/blender/makesdna | |
parent | 35f3682f7c1a1f336144a643b1a2c0fec5dfe105 (diff) |
Render Monster support: (part 1)
Removed all limitations from render code for maximum threads. The only
define for this now is in BLI_threads.h, and currently set to 8.
Note that each thread renders an entire tile, and also allocates the
buffers for the tiles, so; more threads might work better with smaller
tiles.
IMPORTANT: node system won't work yet with more than 2 threads! So, don't
try material nodes or compositing with over 2 threads. That I'll commit
later today.
What does work (should work :) is AO and soft shadow now.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 3 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_world_types.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 18a22fbf35e..91fa866a2fc 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -151,7 +151,7 @@ typedef struct RenderData { int cfra, sfra, efra; /* fames as in 'images' */ int images, framapto, pad3; - short flag, pad1; + short flag, threads; float ctime; /* use for calcutions */ float framelen, blurfac; @@ -514,6 +514,7 @@ typedef struct Scene { #define R_GAUSS 0x20000 /* fbuf obsolete... */ #define R_FBUF 0x40000 + /* threads obsolete... is there for old files */ #define R_THREADS 0x80000 #define R_SPEED 0x100000 diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h index edc621ba758..1d11697aca4 100644 --- a/source/blender/makesdna/DNA_world_types.h +++ b/source/blender/makesdna/DNA_world_types.h @@ -102,7 +102,7 @@ typedef struct World { /* ambient occlusion */ float aodist, aodistfac, aoenergy, aobias; short aomode, aosamp, aomix, aocolor; - float *aosphere; + float *aosphere, *aotables; struct Ipo *ipo; struct MTex *mtex[10]; |