Campbell Barton 8eb41f0fdb svn merge ^/trunk/blender -r41998:42009

2011-11-20 16:05:51 +00:00

..

avi

correct indentation and some whitespace edits (no functional changes)

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

blenfont

Moving spanish code from es_ES to es for now (as the best spanish translation is es.po...).

2011-11-18 09:16:29 +00:00

blenkernel

svn merge ^/trunk/blender -r41998:42009

2011-11-20 16:05:51 +00:00

blenlib

svn merge ^/trunk/blender -r41998:42009

2011-11-20 16:05:51 +00:00

blenloader

svn merge ^/trunk/blender -r41998:42009

2011-11-20 16:05:51 +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

speedup for editmesh tesselation (approx 4.4x speedup in optimized builds),

2011-11-18 16:06:20 +00:00

collada

svn merge -r41751:41779 ^/trunk/blender

2011-11-15 02:05:32 +00:00

editors

svn merge ^/trunk/blender -r41998:42009

2011-11-20 16:05:51 +00:00

gpu

svn merge -r41779:41847 ^/trunk/blender

2011-11-15 02:58:06 +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 #29321: Video does not display, gets frozen or flickers

2011-11-18 20:55:06 +00:00

makesdna

svn merge ^/trunk/blender -r41998:42009

2011-11-20 16:05:51 +00:00

makesrna

svn merge ^/trunk/blender -r41998:42009

2011-11-20 16:05:51 +00:00

modifiers

svn merge ^/trunk/blender -r41998:42009

2011-11-20 16:05:51 +00:00

nodes

share code for fluidsim, ocean & dynamic paint file paths.

2011-11-20 14:38:11 +00:00

python

- pyapi mathutils.geometry.intersect_plane_plane

2011-11-20 05:56:21 +00:00

quicktime

correct indentation and some whitespace edits (no functional changes)

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

render

svn merge ^/trunk/blender -r41998:42009

2011-11-20 16:05:51 +00:00

windowmanager

svn merge -r41847:41899 ^/trunk/blender

2011-11-16 03:10:15 +00:00

CMakeLists.txt

svn merge -r41722:41723 ^/trunk/blender

2011-11-11 06:25:45 +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