https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-mxcurioni (r22789) and https://svn.blender.org/svnroot/bf-blender/trunk/blender (r23338) with the "Ignore ancestry" and "Ignore line endings" options enabled (using TortoiseSVN on Windows). After the merge operation, all changes (i.e., deletion) in source/blender/freestyle/ were reverted in order to keep the primary source tree of the Freestyle renderer.
7 lines
128 B
Python
7 lines
128 B
Python
#!/usr/bin/python
|
|
Import ('env')
|
|
|
|
source = 'winblender.rcscons'
|
|
|
|
env.BlenderRes('winresource', source, ['core'], priority=[95])
|