Campbell Barton 57ed2fd1c1 svn merge ^/trunk/blender -r42757:42759

2011-12-20 10:59:56 +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

replace FILE_MAXDIR + FILE_MAXFILE with FILE_MAX

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

blenkernel

svn merge ^/trunk/blender -r42742:42757

2011-12-20 08:09:46 +00:00

blenlib

svn merge ^/trunk/blender -r42742:42757

2011-12-20 08:09:46 +00:00

blenloader

svn merge ^/trunk/blender -r42742:42757

2011-12-20 08:09:46 +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

Partial fix for #29601 - fixes infinite loop in edgesplit; but edgesplit (angles) messes the geometry still

2011-12-14 14:53:22 +00:00

collada

svn merge ^/trunk/blender -r42669:42670

2011-12-16 23:50:55 +00:00

editors

svn merge ^/trunk/blender -r42757:42759

2011-12-20 10:59:56 +00:00

gpu

svn merge ^/trunk/blender -r42680:42722

2011-12-19 10:40:48 +00:00

ikplugin

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

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

imbuf

Code cleanup: fix a few warnings (>= 0 and == -1 tests on unsigned types).

2011-12-17 01:13:02 +00:00

makesdna

svn merge ^/trunk/blender -r42742:42757

2011-12-20 08:09:46 +00:00

makesrna

svn merge ^/trunk/blender -r42742:42757

2011-12-20 08:09:46 +00:00

modifiers

svn merge ^/trunk/blender -r42722:42742

2011-12-20 01:33:14 +00:00

nodes

Automatically hide unused (=unlinked) node sockets in collapsed ("hidden") nodes. This is to make nodes with many sockets cleaner and simpler, which is the purpose of collapsing nodes in the first place.

2011-12-19 12:04:05 +00:00

python

patch [#29662] Modifications to Mathutils Vectors for Consistency with Commit 42752

2011-12-20 05:48:35 +00:00

quicktime

Fix use of deprecated im_type member in quicktime export.

2011-12-16 22:33:22 +00:00

render

svn merge ^/trunk/blender -r42722:42742

2011-12-20 01:33:14 +00:00

windowmanager

svn merge ^/trunk/blender -r42680:42722

2011-12-19 10:40:48 +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