Sergey Sharybin 58da4a1760 Merging r50576 through r50587 from trunk into soc-2011-tomato

2012-09-14 14:05:05 +00:00

..

avi

Merging r50576 through r50587 from trunk into soc-2011-tomato

2012-09-14 14:05:05 +00:00

blenfont

Fix typo in blenfont sconscript, broke compile

2012-09-13 08:09:12 +00:00

blenkernel

Merging r50576 through r50587 from trunk into soc-2011-tomato

2012-09-14 14:05:05 +00:00

blenlib

Merging r50522 through r50572 from trunk into soc-2011-tomato

2012-09-13 11:13:13 +00:00

blenloader

Color Management: improve compatibility with old files with disabled color management

2012-09-11 16:28:01 +00:00

bmesh

Merging r50522 through r50572 from trunk into soc-2011-tomato

2012-09-13 11:13:13 +00:00

collada

Merging r50522 through r50572 from trunk into soc-2011-tomato

2012-09-13 11:13:13 +00:00

compositor

Merging r50576 through r50587 from trunk into soc-2011-tomato

2012-09-14 14:05:05 +00:00

datatoc

fix for own error in datatoc.c - data wasn't NULL terminated, in some cases this is expected (broke GLSL shaders).

2012-08-12 16:51:51 +00:00

editors

Merging r50576 through r50587 from trunk into soc-2011-tomato

2012-09-14 14:05:05 +00:00

gpu

Color Management: finish pipeline changes

2012-09-10 11:46:15 +00:00

ikplugin

Merging r50423 through r50449 from trunk into soc-2011-tomato

2012-09-06 09:44:32 +00:00

imbuf

Merging r50576 through r50587 from trunk into soc-2011-tomato

2012-09-14 14:05:05 +00:00

makesdna

Merging r50522 through r50572 from trunk into soc-2011-tomato

2012-09-13 11:13:13 +00:00

makesrna

Merging r50576 through r50587 from trunk into soc-2011-tomato

2012-09-14 14:05:05 +00:00

modifiers

Merging r50522 through r50572 from trunk into soc-2011-tomato

2012-09-13 11:13:13 +00:00

nodes

Merging r50576 through r50587 from trunk into soc-2011-tomato

2012-09-14 14:05:05 +00:00

opencl

disable opencl when compo is disabled.

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

python

Merging r50502 through r50521 from trunk into soc-2011-tomato

2012-09-11 09:13:57 +00:00

quicktime

Merging r50265 through r50373 from trunk into soc-2011-tomato

2012-09-04 09:06:37 +00:00

render

Merging r50576 through r50587 from trunk into soc-2011-tomato

2012-09-14 14:05:05 +00:00

windowmanager

Merging r50522 through r50572 from trunk into soc-2011-tomato

2012-09-13 11:13:13 +00:00

CMakeLists.txt

add back datatoc, use this instead of cmake script which was too slow.

2012-08-11 16:25:31 +00:00

SConscript

Scons:

2012-06-30 22:44:36 +00:00