Campbell Barton ae25aa2210 svn merge ^/trunk/blender -r55372:55392

2013-03-18 22:37:04 +00:00

..

avi

Fix for build error with previous commit, seems the order of #includes matters here.

2013-03-13 17:30:31 +00:00

blenfont

Merged changes in the trunk up to revision 55357.

2013-03-18 00:48:59 +00:00

blenkernel

svn merge ^/trunk/blender -r55372:55392

2013-03-18 22:37:04 +00:00

blenlib

svn merge ^/trunk/blender -r55372:55392

2013-03-18 22:37:04 +00:00

blenloader

svn merge ^/trunk/blender -r55372:55392

2013-03-18 22:37:04 +00:00

bmesh

svn merge ^/trunk/blender -r55357:55372

2013-03-18 21:45:29 +00:00

collada

code cleanup

2013-03-18 18:25:05 +00:00

compositor

Use extern "C" when including BKE_node.h in C++ compositor code, to avoid linker errors on windows (undefined NODE_INSTANCE_KEY_BASE).

2013-03-18 19:19:28 +00:00

datatoc

avoid using strlen() for comparisons in for loops. for expanding whitespace in the text editor and ui paste.

2012-12-15 07:57:16 +00:00

editors

svn merge ^/trunk/blender -r55372:55392

2013-03-18 22:37:04 +00:00

freestyle

Fix for a crash due to a bug in the handling of singularity in stroke creation,

2013-03-16 22:39:39 +00:00

gpu

code cleanup

2013-03-18 18:25:05 +00:00

ikplugin

code cleanup: favor braces when blocks have mixed brace use.

2013-03-09 03:46:30 +00:00

imbuf

Fix #34672: Image sampling line didn't use color management for byte buffers

2013-03-18 11:34:05 +00:00

makesdna

svn merge ^/trunk/blender -r55372:55392

2013-03-18 22:37:04 +00:00

makesrna

svn merge ^/trunk/blender -r55372:55392

2013-03-18 22:37:04 +00:00

modifiers

code cleanup: name mesh functions more consistently, also use bools for mesh args.

2013-03-17 19:55:10 +00:00

nodes

Node poll_instance callback is optional, check if it exists before executing.

2013-03-18 19:19:26 +00:00

python

svn merge ^/trunk/blender -r55372:55392

2013-03-18 22:37:04 +00:00

quicktime

style cleanup

2013-03-18 11:44:56 +00:00

render

svn merge ^/trunk/blender -r55372:55392

2013-03-18 22:37:04 +00:00

windowmanager

svn merge ^/trunk/blender -r55372:55392

2013-03-18 22:37:04 +00:00

CMakeLists.txt

Merged changes in the trunk up to revision 54421.

2013-02-10 10:17:59 +00:00

SConscript

Merged changes in the trunk up to revision 54421.

2013-02-10 10:17:59 +00:00