Campbell Barton 08f912e6d5 svn merge ^/trunk/blender -r49886:49890

2012-08-14 12:18:58 +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

svn merge ^/trunk/blender -r49886:49890

2012-08-14 12:18:58 +00:00

blenlib

svn merge ^/trunk/blender -r49867:49886

2012-08-14 11:07:42 +00:00

blenloader

fix for missing NULL checks when sequence-strip pointers become NULL because of problems with library linking.

2012-08-13 17:25:03 +00:00

bmesh

style cleanup: use <pre> for doxygen ascii art

2012-08-13 15:17:15 +00:00

collada

fixed: [#32240] Collada import when nodes share geometry but not material

2012-08-12 17:13:07 +00:00

compositor

svn merge ^/trunk/blender -r49886:49890

2012-08-14 12:18:58 +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 -r49867:49886

2012-08-14 11:07:42 +00:00

gpu

style cleanup

2012-08-11 22:12:32 +00:00

ikplugin

Fix compile error, IK_STRETCH_STIFF_EPS was undefined.

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

imbuf

svn merge ^/trunk/blender -r49867:49886

2012-08-14 11:07:42 +00:00

makesdna

svn merge ^/trunk/blender -r49867:49886

2012-08-14 11:07:42 +00:00

makesrna

svn merge ^/trunk/blender -r49867:49886

2012-08-14 11:07:42 +00:00

modifiers

new parameter in assign_material() to specify where material shall be assigned: object, obdata, by userpref(default) (as discussed with ideasman_42)

2012-08-12 17:12:07 +00:00

nodes

use sensor size when calculating dof rather then hard coded values.

2012-08-09 15:59:32 +00:00

opencl

disable opencl when compo is disabled.

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

python

style cleanup

2012-08-11 22:12:32 +00:00

quicktime

code cleanup: spelling

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

render

svn merge ^/trunk/blender -r49867:49886

2012-08-14 11:07:42 +00:00

windowmanager

svn merge ^/trunk/blender -r49867:49886

2012-08-14 11:07:42 +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