diff options
author | Ton Roosendaal <ton@blender.org> | 2006-01-29 14:36:33 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2006-01-29 14:36:33 +0300 |
commit | 2f8708da0282c6abcdd6c2301b708dadc4ddb430 (patch) | |
tree | 069b1e741e6ddc7a6a566163f5378ddbf76684d6 /source/blender/blenlib/SConscript | |
parent | 9ccdad0d13bacba1d0c6995efe23bc77b7866050 (diff) |
Three-in-one commit:
- Compositor now is threaded
Enable it with the Scene buttons "Threads". This will handle over nodes to
individual threads to be calculated. However, if nodes depend on others
they have to wait. The current system only threads per entire node, not for
calculating results in parts.
I've reshuffled the node execution code to evaluate 'changed' events, and
prepare the entire tree to become simply parsed for open jobs with a call
to node = getExecutableNode()
By default, even without 'thread' option active, all node execution is
done within a separate thread.
Also fixed issues in yesterdays commit for 'event based' calculations, it
didn't do animated images, or execute (on rendering) the correct nodes
when you don't have Render-Result nodes included.
- Added generic Thread support in blenlib/ module
The renderer and the node system now both use same code for controlling the
threads. This has been moved to a new C file in blenlib/intern/threads.c.
Check this c file for an extensive doc and example how to use it.
The current implementation for Compositing allows unlimited amount of
threads. For rendering it is still tied to two threads, although it is
pretty easy to extend to 4 already. People with giant amounts of cpus can
poke me once for tests. :)
- Bugfix in creating group nodes
Group node definitions demand a clear separation of 'internal sockets' and
'external sockets'. The first are sockets being linked internally, the latter
are sockets exposed as sockets for the group itself.
When sockets were linked both internal and external, Blender crashed. It is
solved now by removing the external link(s).
Diffstat (limited to 'source/blender/blenlib/SConscript')
-rw-r--r-- | source/blender/blenlib/SConscript | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript index 8b8740a2e6b..e6b50a4e2ff 100644 --- a/source/blender/blenlib/SConscript +++ b/source/blender/blenlib/SConscript @@ -26,6 +26,7 @@ source_files = ['intern/BLI_dynstr.c', 'intern/vectorops.c', 'intern/freetypefont.c', 'intern/jitter.c', + 'intern/threads.c', 'intern/winstuff.c'] @@ -42,4 +43,5 @@ if user_options_dict['USE_INTERNATIONAL'] == 1: blenlib_env.Append (CPPPATH = extra_includes) blenlib_env.Prepend (CPPPATH = user_options_dict['FREETYPE_INCLUDE']) blenlib_env.Append (CPPPATH = user_options_dict['Z_INCLUDE']) +blenlib_env.Append (CPPPATH = user_options_dict['SDL_INCLUDE']) blenlib_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_blenlib', source=source_files) |