Tamito Kajiyama cdbfd1db38 Merged changes in the trunk up to revision 45820. ...

Conflicts resolved:
source/creator/creator.c

2012-04-21 00:33:36 +00:00

..

avi

code cleanup: dont include BLI_winstuff.h on non windows systems, also cleanup some defines/includes for windows.

2012-04-15 07:54:07 +00:00

blenfont

code cleanup: remove/comment some unused code.

2012-04-17 05:09:37 +00:00

blenkernel

Merged changes in the trunk up to revision 45820.

2012-04-21 00:33:36 +00:00

blenlib

Merged changes in the trunk up to revision 45820.

2012-04-21 00:33:36 +00:00

blenloader

Merged changes in the trunk up to revision 45820.

2012-04-21 00:33:36 +00:00

blenpluginapi

style cleanup: follow style guide for formatting of if/for/while loops, and else if's

2012-03-24 06:38:07 +00:00

bmesh

Merged changes in the trunk up to revision 45820.

2012-04-21 00:33:36 +00:00

collada

code cleanup:

2012-04-08 07:34:09 +00:00

editors

Merged changes in the trunk up to revision 45820.

2012-04-21 00:33:36 +00:00

freestyle

New options for specifying unit line thickness.

2012-04-10 23:53:46 +00:00

gpu

code cleanup: dont include BLI_winstuff.h on non windows systems, also cleanup some defines/includes for windows.

2012-04-15 07:54:07 +00:00

ikplugin

Fix [#31008] IK armature resize goes ugly (Pose mode resize).

2012-04-20 17:26:40 +00:00

imbuf

fix for fail thumbs being used when the failed thumbnail image is older then the image/movie/blend.

2012-04-16 15:13:21 +00:00

makesdna

Merged changes in the trunk up to revision 45820.

2012-04-21 00:33:36 +00:00

makesrna

Merged changes in the trunk up to revision 45820.

2012-04-21 00:33:36 +00:00

modifiers

remove BM_ITER, BM_ITER_INDEX macros, use ELEM or MESH variants only (the maceros had unused args in both cases).

2012-04-19 13:47:58 +00:00

nodes

Dynamic output sockets for the image input node. This is needed to enable the node to read arbitrary multilayer exr files. Output sockets of this node are now generated dynamically when the image is updated. The image buffer has to be loaded to detect multilayer files on update.

2012-04-16 13:49:33 +00:00

python

Merged changes in the trunk up to revision 45820.

2012-04-21 00:33:36 +00:00

quicktime

style cleanup: follow style guide for formatting of if/for/while loops, and else if's

2012-03-24 06:24:53 +00:00

render

Merged changes in the trunk up to revision 45820.

2012-04-21 00:33:36 +00:00

windowmanager

Merged changes in the trunk up to revision 45820.

2012-04-21 00:33:36 +00:00

CMakeLists.txt

Merged changes in the trunk up to revision 44266 (including BMesh).

2012-02-21 01:40:04 +00:00

SConscript

Merged changes in the trunk up to revision 44266 (including BMesh).

2012-02-21 01:40:04 +00:00