Campbell Barton 121ff4223d 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

..

avi

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

blenfont

Moving i18n code to BLF_translation.h

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

blenkernel

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

blenlib

correct merge error

2011-11-08 05:33:43 +00:00

blenloader

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

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

bmesh: fixed merge issues with navmesh (though I've not tested if it works yet).

2011-11-08 00:20:50 +00:00

collada

svn merge -r41575:41602 ^/trunk/blender

2011-11-07 07:01:24 +00:00

editors

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

gpu

svn merge -r41650:41655 ^/trunk/blender --- cycles merge, this wont copile, still need to manually update some funcs

2011-11-10 03:05:11 +00:00

ikplugin

Bugfix [#29064] armature with curve contraint - crash

2011-11-07 13:25:17 +00:00

imbuf

svn merge -r41638:41648 ^/trunk/blender

2011-11-10 01:50:22 +00:00

makesdna

svn merge -r41650:41655 ^/trunk/blender --- cycles merge, this wont copile, still need to manually update some funcs

2011-11-10 03:05:11 +00:00

makesrna

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

modifiers

svn merge -r41575:41602 ^/trunk/blender

2011-11-07 07:01:24 +00:00

nodes

Fixed/restored translation of node classes (in foreach_nodeclass funcs)

2011-11-09 15:00:11 +00:00

python

Moving i18n code to BLF_translation.h

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

quicktime

fix for warning on osx

2011-11-03 04:58:11 +00:00

render

svn merge -r41638:41648 ^/trunk/blender

2011-11-10 01:50:22 +00:00

windowmanager

svn merge ^/trunk/blender -r41602:41638 .

2011-11-08 02:57:28 +00:00

CMakeLists.txt

svn merge ^/trunk/blender -r41602:41638 .

2011-11-08 02:57:28 +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