Tamito Kajiyama 1f7ae143a2 Merged changes in the trunk up to revision 48227. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_file/filelist.c

2012-06-24 10:29:26 +00:00

..

avi

style cleanup:

2012-06-17 09:58:26 +00:00

blenfont

style cleanup: defines with braces

2012-05-27 20:13:59 +00:00

blenkernel

Merged changes in the trunk up to revision 48227.

2012-06-24 10:29:26 +00:00

blenlib

Merged changes in the trunk up to revision 48227.

2012-06-24 10:29:26 +00:00

blenloader

Merged changes in the trunk up to revision 48227.

2012-06-24 10:29:26 +00:00

bmesh

Merged changes in the trunk up to revision 48227.

2012-06-24 10:29:26 +00:00

collada

style cleanyp

2012-06-23 23:22:19 +00:00

compositor

style cleanyp

2012-06-23 23:22:19 +00:00

editors

Merged changes in the trunk up to revision 48227.

2012-06-24 10:29:26 +00:00

freestyle

Fix for persistent failures of BLI_assert(CustomData_has_layer(&dm->faceData, CD_POLYINDEX));

2012-06-16 21:49:52 +00:00

gpu

style cleanup

2012-06-20 16:43:48 +00:00

ikplugin

Fix [#31430] part 2: crash in iTaSC when end effector is a fixed bone. This situation was causing access to invalid index in the joint angle array although the end effector doesn't need any joint angle to compute its pause. Fixed this by changing the internal API of joint array: return pointer instead of reference so that NULL pointer can be returned instead of crashing when the index is invalid.

2012-06-07 08:16:41 +00:00

imbuf

style cleanyp

2012-06-23 23:22:19 +00:00

makesdna

Merged changes in the trunk up to revision 48227.

2012-06-24 10:29:26 +00:00

makesrna

Merged changes in the trunk up to revision 48227.

2012-06-24 10:29:26 +00:00

modifiers

style cleanyp

2012-06-23 23:22:19 +00:00

nodes

use an inline function for rgb -> bw conversion.

2012-06-22 07:49:44 +00:00

opencl

____

2012-05-17 12:49:33 +00:00

python

Merged changes in the trunk up to revision 48227.

2012-06-24 10:29:26 +00:00

quicktime

Win32: Compilation fix for quicktime import

2012-05-29 20:06:31 +00:00

render

Merged changes in the trunk up to revision 48227.

2012-06-24 10:29:26 +00:00

windowmanager

Merged changes in the trunk up to revision 48227.

2012-06-24 10:29:26 +00:00

CMakeLists.txt

Merged changes in the trunk up to revision 47700.

2012-06-10 20:50:43 +00:00

SConscript

Merged changes in the trunk up to revision 47381.

2012-06-03 21:11:10 +00:00