Campbell Barton b245dfbc06 svn merge ^/trunk/blender -r42466:42495

2011-12-07 18:29:21 +00:00

..

avi

correct indentation and some whitespace edits (no functional changes)

2011-11-11 13:09:14 +00:00

blenfont

replace FILE_MAXDIR + FILE_MAXFILE with FILE_MAX

2011-11-26 04:07:38 +00:00

blenkernel

svn merge ^/trunk/blender -r42466:42495

2011-12-07 18:29:21 +00:00

blenlib

remove BMEMSET define, use memset instead

2011-12-07 04:27:40 +00:00

blenloader

Quiet annoying warning:

2011-12-06 09:28:25 +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

Quiet annoying warning:

2011-12-06 09:28:25 +00:00

collada

More DM func renames, fixing some build breaks, renaming more stuff, also seems like it might be fixing the recent CDDM_copy corruption/leak bug

2011-11-30 18:03:56 +00:00

editors

svn merge ^/trunk/blender -r42466:42495

2011-12-07 18:29:21 +00:00

gpu

svn merge ^/trunk/blender -r42303:42329

2011-12-02 01:01:07 +00:00

ikplugin

Fix #29041: parenting problem with tree IK for iTaSC and iksolver, where it

2011-11-13 13:08:15 +00:00

imbuf

fix building on openbsd, also quiet some warnings.

2011-12-04 15:45:53 +00:00

makesdna

svn merge ^/trunk/blender -r42466:42495

2011-12-07 18:29:21 +00:00

makesrna

svn merge ^/trunk/blender -r42466:42495

2011-12-07 18:29:21 +00:00

modifiers

remove BMEMSET define, use memset instead

2011-12-07 04:27:40 +00:00

nodes

Invert Color Cycles Node

2011-12-03 23:05:35 +00:00

python

fix for noise module in driver namespace (was infact mathutils).

2011-12-07 00:36:57 +00:00

quicktime

OSX: match quicktime and QTKit export to other formats/codecs

2011-12-02 18:09:31 +00:00

render

svn merge ^/trunk/blender -r42372:42416

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

windowmanager

svn merge ^/trunk/blender -r42466:42495

2011-12-07 18:29:21 +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