Sergey Sharybin cdb144ade9 Merging r50618 through r50624 from trunk into soc-2011-tomato

2012-09-15 07:53:34 +00:00

..

avi

Merging r50618 through r50624 from trunk into soc-2011-tomato

2012-09-15 07:53:34 +00:00

blenfont

Merging r50618 through r50624 from trunk into soc-2011-tomato

2012-09-15 07:53:34 +00:00

blenkernel

Merging r50618 through r50624 from trunk into soc-2011-tomato

2012-09-15 07:53:34 +00:00

blenlib

Merging r50602 through r50617 form trunk into soc-2011-tomato

2012-09-15 06:24:48 +00:00

blenloader

Merging r50618 through r50624 from trunk into soc-2011-tomato

2012-09-15 07:53:34 +00:00

bmesh

Merging r50602 through r50617 form trunk into soc-2011-tomato

2012-09-15 06:24:48 +00:00

collada

Merging r50602 through r50617 form trunk into soc-2011-tomato

2012-09-15 06:24:48 +00:00

compositor

Merging r50618 through r50624 from trunk into soc-2011-tomato

2012-09-15 07:53:34 +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 r50618 through r50624 from trunk into soc-2011-tomato

2012-09-15 07:53:34 +00:00

gpu

Merging r50618 through r50624 from trunk into soc-2011-tomato

2012-09-15 07:53:34 +00:00

ikplugin

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

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

imbuf

Merging r50618 through r50624 from trunk into soc-2011-tomato

2012-09-15 07:53:34 +00:00

makesdna

Merging r50618 through r50624 from trunk into soc-2011-tomato

2012-09-15 07:53:34 +00:00

makesrna

Color Management: image buffer loading reworked

2012-09-14 14:36:47 +00:00

modifiers

Merging r50618 through r50624 from trunk into soc-2011-tomato

2012-09-15 07:53:34 +00:00

nodes

Merging r50618 through r50624 from trunk into soc-2011-tomato

2012-09-15 07:53:34 +00:00

opencl

disable opencl when compo is disabled.

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

python

Merging r50602 through r50617 form trunk into soc-2011-tomato

2012-09-15 06:24:48 +00:00

quicktime

Color Management: get rid of image buffer's profile flag

2012-09-14 14:37:19 +00:00

render

Merging r50602 through r50617 form trunk into soc-2011-tomato

2012-09-15 06:24:48 +00:00

windowmanager

Merging r50602 through r50617 form trunk into soc-2011-tomato

2012-09-15 06:24:48 +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