Hi, I am currently resolving some issues, but it seems you did not merge over changes outside of source/ and release/ Please check all other directories as well, to make sure nothing is forgotten.
Am 06.04.2013 18:32, schrieb Tamito Kajiyama: > Revision: 55847 > > http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55847 > Author: kjym3 > Date: 2013-04-06 16:32:55 +0000 (Sat, 06 Apr 2013) > Log Message: > ----------- > Part II of the Freestyle branch merger: modifications to the trunk code base. > > This commit concludes the two-part merger of the soc-2008-mxcurioni > (Freestyle) > branch started in revision 55846. A number of modifications and additions has > been made to the trunk code base to integrate the Freestyle non-photorealistic > (NPR) renderer into Blender. All the changes in this commit were made by > applying a diff from the branch to the trunk (instead of svn merge, due to > broken > svn:mergeinfo properties of the branch). > -- Thomas Dinges Blender Developer, Artist and Musician www.dingto.org _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
