Merged

Browse Source

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.

...

This commit is contained in:

Tamito Kajiyama

2009-09-18 22:25:49 +00:00

parent 0a4d70f4d0

commit be50ce61be

3509 changed files with 612152 additions and 643374 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1286

release/scripts/freestyle/style_modules/shaders.py

File diff suppressed because it is too large Load Diff