Tamito Kajiyama 4ea2fb8b0a Merged changes in the trunk up to revision 49478. ...

Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c

2012-08-02 00:10:05 +00:00

..

avi

prevent uninitialized memory use when writing avi's.

2012-07-31 10:34:42 +00:00

blenfont

Portuguese is now over 60% (also finisehd old portuguse_brazilian->portuguese move).

2012-07-23 12:10:21 +00:00

blenkernel

Merged changes in the trunk up to revision 49478.

2012-08-02 00:10:05 +00:00

blenlib

Merged changes in the trunk up to revision 49478.

2012-08-02 00:10:05 +00:00

blenloader

Merged changes in the trunk up to revision 49478.

2012-08-02 00:10:05 +00:00

bmesh

Merged changes in the trunk up to revision 49478.

2012-08-02 00:10:05 +00:00

collada

style cleanup

2012-07-21 22:58:08 +00:00

compositor

Code cleanup: remove some more unused includes of DNA_scene_types

2012-08-01 14:51:12 +00:00

editors

Merged changes in the trunk up to revision 49478.

2012-08-02 00:10:05 +00:00

freestyle

Better handling of the ESC key during Freestyle rendering.

2012-07-16 23:29:12 +00:00

gpu

Tweak to commit related to non-power-of-two textures, some cards claim to

2012-07-31 15:05:14 +00:00

ikplugin

Fix compile error, IK_STRETCH_STIFF_EPS was undefined.

2012-07-29 19:50:03 +00:00

imbuf

code cleanup: replace MIN2/MAX2 with minf/maxf

2012-07-29 16:59:51 +00:00

makesdna

Merged changes in the trunk up to revision 49478.

2012-08-02 00:10:05 +00:00

makesrna

Merged changes in the trunk up to revision 49478.

2012-08-02 00:10:05 +00:00

modifiers

code cleanup: replace MIN2/MAX2 with minf/maxf

2012-07-29 16:59:51 +00:00

nodes

remove references to raskter from compositor and BKE mask.

2012-07-31 16:04:47 +00:00

opencl

disable opencl when compo is disabled.

2012-06-30 14:28:45 +00:00

python

Merged changes in the trunk up to revision 49478.

2012-08-02 00:10:05 +00:00

quicktime

code cleanup: spelling

2012-07-16 23:23:33 +00:00

render

Merged changes in the trunk up to revision 49478.

2012-08-02 00:10:05 +00:00

windowmanager

Merged changes in the trunk up to revision 49478.

2012-08-02 00:10:05 +00:00

CMakeLists.txt

Merged changes in the trunk up to revision 48505.

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

SConscript

Merged changes in the trunk up to revision 48505.

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