Tamito Kajiyama c8deda3276 Merged changes in the trunk up to revision 35505. ...

Conflicts resolved:
source/blender/makesdna/DNA_material_types.h

2011-03-13 02:10:39 +00:00

..

freestyle

Made stroke rendering stability fixes, with the aim of addressing

2011-01-31 20:57:39 +00:00

io/netrender

2.5 Netrender UI File:

2011-02-28 14:34:13 +00:00

keyingsets

replace import *'s with named imports (using * is convenient for some scripts but considered bad practice by python devs)

2011-02-27 15:25:24 +00:00

modules

library loading api.

2011-03-12 16:06:37 +00:00

op

Merged changes in the trunk up to revision 35505.

2011-03-13 02:10:39 +00:00

presets

pep8 cleanup

2011-02-04 09:27:25 +00:00

templates

replace import *'s with named imports (using * is convenient for some scripts but considered bad practice by python devs)

2011-02-27 15:25:24 +00:00

ui

Merged changes in the trunk up to revision 35505.

2011-03-13 02:10:39 +00:00