Tamito Kajiyama 8135cc9f95 Merged changes in the trunk up to revision 47700. ...

Conflicts resolved:
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/SConscript
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/windowmanager/WM_types.h

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

..

avi

code cleanup: spelling

2012-05-20 21:23: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 47700.

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

blenlib

Merged changes in the trunk up to revision 47700.

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

blenloader

Merged changes in the trunk up to revision 47700.

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

bmesh

Merged changes in the trunk up to revision 47700.

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

collada

[#31739] Collada: New Export selections 'Include Armatures'

2012-06-07 17:55:26 +00:00

compositor

Applied and completed a compositor patch by Brecht to use signalling and waiting in scheduling and worker threads instead of continuous loops with sleep times. This should help reduce unnecessary wait times in Tile.

2012-06-10 12:26:33 +00:00

editors

Merged changes in the trunk up to revision 47700.

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

freestyle

Made an attempt to fix an instability issue in stroke rendering due to a failure

2012-06-03 22:53:12 +00:00

gpu

Index: source/blender/gpu/intern/gpu_draw.c

2012-06-08 13:06:06 +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 cleanup

2012-06-06 22:38:39 +00:00

makesdna

Merged changes in the trunk up to revision 47700.

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

makesrna

Merged changes in the trunk up to revision 47700.

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

modifiers

Another fix for #31743: check for DM's verts number matches passed number of vertices

2012-06-08 09:15:45 +00:00

nodes

code cleanup: doxy comment filename corrections

2012-06-08 23:43:11 +00:00

opencl

____

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

python

Merged changes in the trunk up to revision 47700.

2012-06-10 20:50:43 +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 47700.

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

windowmanager

Merged changes in the trunk up to revision 47700.

2012-06-10 20:50:43 +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