Campbell Barton 944dfa23c4 svn merge ^/trunk/blender -r43392:43420

2012-01-16 11:50:17 +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 -r43392:43420

2012-01-16 11:50:17 +00:00

blenlib

svn merge ^/trunk/blender -r43345:43381

2012-01-15 09:16:39 +00:00

blenloader

svn merge ^/trunk/blender -r43392:43420

2012-01-16 11:50:17 +00:00

blenpluginapi

svn merge -r41287:41310 ^/trunk/blender note, mirror modifier had slow, per vertex name flipping, replaced with flip_map from trunk

2011-10-27 09:42:03 +00:00

bmesh

svn merge ^/trunk/blender -r43294:43338

2012-01-13 01:39:57 +00:00

collada

rename normal calc functions.

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

editors

svn merge ^/trunk/blender -r43392:43420

2012-01-16 11:50:17 +00:00

gpu

svn merge ^/trunk/blender -r43278:43294

2012-01-11 15:04:54 +00:00

ikplugin

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

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

imbuf

replace fixed sizes with sizeof when passing string length since size wasn't always correct.

2012-01-12 13:16:30 +00:00

makesdna

svn merge ^/trunk/blender -r43392:43420

2012-01-16 11:50:17 +00:00

makesrna

svn merge ^/trunk/blender -r43392:43420

2012-01-16 11:50:17 +00:00

modifiers

svn merge ^/trunk/blender -r43278:43294

2012-01-11 15:04:54 +00:00

nodes

fix [#29887] Alt + g in a node group results in crash

2012-01-14 18:11:45 +00:00

python

middle mouse jump scrolling for text window.

2012-01-16 10:48:52 +00:00

quicktime

Fix related to #29694: quicktime export was not showing or respecting RGBA

2012-01-12 21:10:46 +00:00

render

svn merge ^/trunk/blender -r43345:43381

2012-01-15 09:16:39 +00:00

windowmanager

svn merge ^/trunk/blender -r43392:43420

2012-01-16 11:50:17 +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