Tamito Kajiyama b7b5029814 Merged changes in the trunk up to revision 48695.

2012-07-06 23:46:48 +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 48695.

2012-07-06 23:46:48 +00:00

blenlib

Merged changes in the trunk up to revision 48695.

2012-07-06 23:46:48 +00:00

blenloader

Merged changes in the trunk up to revision 48695.

2012-07-06 23:46:48 +00:00

bmesh

Merged changes in the trunk up to revision 48695.

2012-07-06 23:46:48 +00:00

collada

style cleanup

2012-07-04 20:47:12 +00:00

compositor

* Added OpenCL implementation of the Defocus node

2012-07-06 11:31:40 +00:00

editors

Merged changes in the trunk up to revision 48695.

2012-07-06 23:46:48 +00:00

freestyle

Fix for Stroke::Resample() in combination with the previous commit.

2012-07-02 21:49:19 +00:00

gpu

Spellfixes: colour -> color

2012-07-04 12:19:50 +00:00

ikplugin

More spell and typo fixes (mostly visualise->visualize, grey->gray, normalise->normalize).

2012-07-03 19:09:07 +00:00

imbuf

style cleanup

2012-07-04 20:47:12 +00:00

makesdna

Merged changes in the trunk up to revision 48695.

2012-07-06 23:46:48 +00:00

makesrna

Merged changes in the trunk up to revision 48695.

2012-07-06 23:46:48 +00:00

modifiers

Fix [#31923] Particle instanced objects don't show textures in render

2012-07-06 10:03:27 +00:00

nodes

style cleanup

2012-07-04 20:47:12 +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 48695.

2012-07-06 23:46:48 +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 48695.

2012-07-06 23:46:48 +00:00

windowmanager

Merged changes in the trunk up to revision 48695.

2012-07-06 23:46:48 +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