Tamito Kajiyama b7cd9ec3ad Merged changes in the trunk up to revision 52340. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c

2012-11-19 00:41:11 +00:00

..

avi

style cleanup: if's on the same line.

2012-11-18 02:41:55 +00:00

blenfont

Clen up of gettext stuff from scons scripts... Did not touch to buildbots ones, nor to iconv, as it’s still uncleare whether we can get rid of it :/

2012-11-11 19:46:36 +00:00

blenkernel

Merged changes in the trunk up to revision 52340.

2012-11-19 00:41:11 +00:00

blenlib

Merged changes in the trunk up to revision 52340.

2012-11-19 00:41:11 +00:00

blenloader

Merged changes in the trunk up to revision 52340.

2012-11-19 00:41:11 +00:00

bmesh

Merged changes in the trunk up to revision 52340.

2012-11-19 00:41:11 +00:00

collada

style cleanup: comments & spelling

2012-11-18 01:22:31 +00:00

compositor

Fix compositing normal node not properly showing vector XYZ values when opening

2012-11-17 16:11:02 +00:00

datatoc

remove unneeded string in datatoc.c and correct some of the context types in our documentation.

2012-11-03 09:14:06 +00:00

editors

Merged changes in the trunk up to revision 52340.

2012-11-19 00:41:11 +00:00

freestyle

Improvements of Freestyle GUI controls - Part 1.

2012-10-28 16:09:51 +00:00

gpu

Image thread safe improvements

2012-11-15 15:59:58 +00:00

ikplugin

Last fix to get_plugin in ikplugin_api.c was off by one in the wrong direction.

2012-11-13 11:31:54 +00:00

imbuf

style cleanup: if's on the same line.

2012-11-18 02:41:55 +00:00

makesdna

Merged changes in the trunk up to revision 52340.

2012-11-19 00:41:11 +00:00

makesrna

Merged changes in the trunk up to revision 52340.

2012-11-19 00:41:11 +00:00

modifiers

Request from Riggers/Animators at BlenderPRO:

2012-11-18 13:10:43 +00:00

nodes

style cleanup: comments & spelling

2012-11-18 01:22:31 +00:00

opencl

code cleanup: remove $Id's that crept back in, also osl style edits

2012-10-23 11:47:23 +00:00

python

Merged changes in the trunk up to revision 52340.

2012-11-19 00:41:11 +00:00

quicktime

OSX: some more version target cleanups and corrections

2012-11-07 10:43:31 +00:00

render

Merged changes in the trunk up to revision 52340.

2012-11-19 00:41:11 +00:00

windowmanager

Merged changes in the trunk up to revision 52340.

2012-11-19 00:41:11 +00:00

CMakeLists.txt

Merged changes in the trunk up to revision 51448.

2012-10-20 16:48:48 +00:00

SConscript

Merged changes in the trunk up to revision 48505.

2012-07-03 00:02:45 +00:00