Tamito Kajiyama cc3adc2202 Merged changes in the trunk up to revision 43038. ...

Conflicts resolved:
source/blender/makesdna/DNA_material_types.h
source/blenderplayer/bad_level_call_stubs/stubs.c

2011-12-31 21:09:26 +00:00

..

freestyle

Updates on the Parameter Editor mode:

2011-12-11 23:41:15 +00:00

modules

check for presets in addons dirs. this way addons can install their own presets too.

2011-12-30 08:39:40 +00:00

presets

Object tracking integration

2011-12-30 18:06:02 +00:00

startup

Merged changes in the trunk up to revision 43038.

2011-12-31 21:09:26 +00:00

templates

rename user interface operator properties from 'op' to 'props'

2011-10-23 00:53:50 +00:00