Tamito Kajiyama 141dd5233e Merged changes in the trunk up to revision 50257. ...

Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt

2012-08-29 00:53:29 +00:00

..

freestyle

Fix for the WithinImageBorderUP1D predicate not working with a ViewEdge such that

2012-05-28 23:53:28 +00:00

modules

Adding despeckle as “blender” word...

2012-08-27 21:01:21 +00:00

presets

split off auto depth option to have cursor placement use depth too since you dont always want both.

2012-08-10 10:34:24 +00:00

startup

Merged changes in the trunk up to revision 50257.

2012-08-29 00:53:29 +00:00

templates

add manual lookup to addon tempalte

2012-08-25 15:00:41 +00:00