Campbell Barton a63efc00cc svn merge ^/trunk/blender -r43611:43616

2012-01-22 20:15:05 +00:00

..

avi

style edit only - move parenthesis onto second line of function definition (in keeping with most of blenders code)

2011-12-17 00:52:36 +00:00

blenfont

use BLI_strncpy and BLI_snprintf when the size of the string is known.

2012-01-11 12:33:51 +00:00

blenkernel

svn merge ^/trunk/blender -r43611:43616

2012-01-22 20:15:05 +00:00

blenlib

svn merge ^/trunk/blender -r43564:43609

2012-01-22 18:04:35 +00:00

blenloader

svn merge ^/trunk/blender -r43564:43609

2012-01-22 18:04:35 +00:00

blenpluginapi

svn merge ^/trunk/blender -r43564:43609

2012-01-22 18:04:35 +00:00

bmesh

minor header tidy up

2012-01-22 18:44:44 +00:00

collada

rename normal calc functions.

2012-01-06 00:08:37 +00:00

editors

svn merge ^/trunk/blender -r43611:43616

2012-01-22 20:15:05 +00:00

gpu

svn merge ^/trunk/blender -r43472:43482

2012-01-18 07:04:17 +00:00

ikplugin

Math lib: matrix multiplication order fix for two functions that were

2011-12-16 19:53:12 +00:00

imbuf

change filepath limit from 240 to 1024

2012-01-21 14:54:53 +00:00

makesdna

Merged with trunk (-r43609:43611): updated modifier preview.

2012-01-22 20:05:26 +00:00

makesrna

svn merge ^/trunk/blender -r43564:43609

2012-01-22 18:04:35 +00:00

modifiers

Merged with trunk (-r43609:43611): updated modifier preview.

2012-01-22 20:05:26 +00:00

nodes

Fix for missing NULL check in socket default_value free function. Some sockets (currently only cycles shader sockets) don't actually have a default_value pointer.

2012-01-21 16:36:06 +00:00

python

formatting edits (<120 line length), remove invalid 'defaults' keyword arg from docs.

2012-01-21 10:27:24 +00:00

quicktime

Fix #29935: missing cycles update/crash when removing world datablock form scene.

2012-01-22 13:56:39 +00:00

render

svn merge ^/trunk/blender -r43564:43609

2012-01-22 18:04:35 +00:00

windowmanager

svn merge ^/trunk/blender -r43564:43609

2012-01-22 18:04:35 +00:00

CMakeLists.txt

svn merge ^/trunk/blender -r42372:42416

2011-12-04 18:39:19 +00:00

SConscript

svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build

2011-11-10 04:17:43 +00:00