[Bf-taskforce25] Animsys branch vs trunk

Ton Roosendaal ton at blender.org
Tue Dec 23 13:16:31 CET 2008


Hi,

Joshua has been fixing some things for his animation system branch...  
that means we should merge those files in 2.5 branch, and not the ones  
from trunk.
Affected (and currently relevant to keep track of) are:

(for Joshua)
drawaction.c 	
editaction.c
header_action.c
drawipo.c
editarmature.c
editipo_lib.c
editipo_mods.c
editipo.c
header_ipo.c
header_nla.c

(for Martin)
transform_generics.c
transform.c
transform_conversions.c

(for Ton, Brecht)
editobject.c
toolbox.c
headerbuttons.c
meshtools.c 	

You can download those files this way:

svn cat  
https://svn.blender.org/svnroot/bf-blender/branches/animsys2/source/ 
blender/src/editobject.c > editobject.c

or with adding to svn immediate:

svn copy  
https://svn.blender.org/svnroot/bf-blender/trunk/blender/source/ 
blender/src/editobject.c editobject.c

Of course, Joshua can also merge animsys2 branch in trunk... but that  
has a couple of disadvantages;
- trunk is now more or less the "stable" branch.
- improvements and fixes in 2.5 animsys vs 2.48a animsys will be  
complicated to manage...

-Ton-

------------------------------------------------------------------------
Ton Roosendaal  Blender Foundation   ton at blender.org    www.blender.org
Blender Institute BV  Entrepotdok 57A  1018AD Amsterdam The Netherlands



More information about the Bf-taskforce25 mailing list