Campbell Barton f461800435 svn merge ^/trunk/blender -r42077:42080

2011-11-22 19:04:40 +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 -r42069:42076

2011-11-22 18:15:08 +00:00

blenlib

Fix for [#28528] Disappearing Faces

2011-11-22 14:04:33 +00:00

blenloader

svn merge ^/trunk/blender -r42009:42053

2011-11-22 11:51:42 +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

Various typo cleanups, remove unnecessary code etc, found during recent work and separated to a cleanup change

2011-11-20 16:21:13 +00:00

collada

svn merge -r41751:41779 ^/trunk/blender

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

editors

svn merge ^/trunk/blender -r42069:42076

2011-11-22 18:15:08 +00:00

gpu

svn merge ^/trunk/blender -r42009:42053

2011-11-22 11:51:42 +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

replace ImBuf.depth with ImBuf.planes to match ImageFormatData.planes & to avoid confusion with ImageFormatData.depth

2011-11-21 20:47:19 +00:00

makesdna

svn merge ^/trunk/blender -r42009:42053

2011-11-22 11:51:42 +00:00

makesrna

svn merge ^/trunk/blender -r42077:42080

2011-11-22 19:04:40 +00:00

modifiers

svn merge ^/trunk/blender -r42077:42080

2011-11-22 19:04:40 +00:00

nodes

rename image type defines to be less ambiguous, also set BMP as not supporting alpha (it reads but cant write)

2011-11-22 00:35:26 +00:00

python

fix [#29319] bus error with python with link_append and {}

2011-11-22 14:05:08 +00:00

quicktime

rename image type defines to be less ambiguous, also set BMP as not supporting alpha (it reads but cant write)

2011-11-22 00:35:26 +00:00

render

svn merge ^/trunk/blender -r42009:42053

2011-11-22 11:51:42 +00:00

windowmanager

svn merge ^/trunk/blender -r42009:42053

2011-11-22 11:51:42 +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