Campbell Barton 1920c4ef39 svn merge ^/trunk/blender -r50023:50036

2012-08-20 10:16:22 +00:00

..

avi

add MEM_recallocN(), so bytes are ensured to be zero'd when growing.

2012-08-11 12:16:09 +00:00

blenfont

fix [#32126] STAMP: Setting a background color causes color flicker

2012-08-12 22:50:21 +00:00

blenkernel

Merging r50016 through r50021 from trunk into soc-2011-tomato

2012-08-19 15:44:59 +00:00

blenlib

Merging r49953 through r50015 into from trunk into soc-2011-tomato

2012-08-19 13:57:55 +00:00

blenloader

Sequencer: per-sequence modifier stack for color grading

2012-08-19 15:41:56 +00:00

bmesh

- fix for error in ndof patch.

2012-08-19 15:56:49 +00:00

collada

Collada: fixed export when 'active UV Layer only' was selected

2012-08-15 22:08:22 +00:00

compositor

Merging r49953 through r50015 into from trunk into soc-2011-tomato

2012-08-19 13:57:55 +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

svn merge ^/trunk/blender -r50023:50036

2012-08-20 10:16:22 +00:00

gpu

Moving more duplicate code from GPU_create_gl_tex_compressed() and BL_Texture::InitGLCompressedTex() into GPU_Upload_dxt_texture(). This reduces code duplication and ensures that both paths are using the same settings.

2012-08-18 03:32:28 +00:00

ikplugin

cmake option to build without iksolver

2012-08-18 13:36:29 +00:00

imbuf

Merging r49953 through r50015 into from trunk into soc-2011-tomato

2012-08-19 13:57:55 +00:00

makesdna

Merging r50022 through r50023 from trunk into soc-2011-tomato

2012-08-19 16:18:33 +00:00

makesrna

svn merge ^/trunk/blender -r50023:50036

2012-08-20 10:16:22 +00:00

modifiers

skip allocating texture coords for the displace modifier when they are unused.

2012-08-18 11:48:35 +00:00

nodes

disabling the compositor legacy build option now ifdef's exec() functions.

2012-08-19 23:36:29 +00:00

opencl

disable opencl when compo is disabled.

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

python

fix for own error in bpy.utils.blend_paths() arg parsing.

2012-08-20 10:14:11 +00:00

quicktime

code cleanup: spelling

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

render

Merging r49953 through r50015 into from trunk into soc-2011-tomato

2012-08-19 13:57:55 +00:00

windowmanager

Merging r49953 through r50015 into from trunk into soc-2011-tomato

2012-08-19 13:57:55 +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