Ton Roosendaal
2f8708da02
- 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).
48 lines
1.6 KiB
Python
48 lines
1.6 KiB
Python
#!/usr/bin/python
|
|
Import ('extra_includes')
|
|
Import ('user_options_dict')
|
|
Import ('library_env')
|
|
|
|
blenlib_env = library_env.Copy ()
|
|
|
|
source_files = ['intern/BLI_dynstr.c',
|
|
'intern/BLI_ghash.c',
|
|
'intern/edgehash.c',
|
|
'intern/BLI_linklist.c',
|
|
'intern/BLI_memarena.c',
|
|
'intern/arithb.c',
|
|
'intern/dynlib.c',
|
|
'intern/fileops.c',
|
|
'intern/gsqueue.c',
|
|
'intern/matrixops.c',
|
|
'intern/noise.c',
|
|
'intern/psfont.c',
|
|
'intern/rand.c',
|
|
'intern/rct.c',
|
|
'intern/scanfill.c',
|
|
'intern/storage.c',
|
|
'intern/time.c',
|
|
'intern/util.c',
|
|
'intern/vectorops.c',
|
|
'intern/freetypefont.c',
|
|
'intern/jitter.c',
|
|
'intern/threads.c',
|
|
'intern/winstuff.c']
|
|
|
|
|
|
blenlib_env.Append (CPPPATH = ['.',
|
|
'../blenlib',
|
|
'../makesdna',
|
|
'../blenkernel',
|
|
'#/intern/guardedalloc',
|
|
'../include'])
|
|
|
|
if user_options_dict['USE_INTERNATIONAL'] == 1:
|
|
blenlib_env.Append (CPPDEFINES = 'WITH_FREETYPE2')
|
|
|
|
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)
|