[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55847] trunk/blender: Part II of the Freestyle branch merger: modifications to the trunk code base.

Tamito KAJIYAMA rd6t-kjym at asahi-net.or.jp
Sun Apr 7 09:00:38 CEST 2013


Hi Thomas,

Thanks for the note.  I just committed missing updates in other directories.
Manual merging oprations are definitely worth avoiding, although there was
no other choice this time due to svn merge not working as expected.

Regards,

-- 
KAJIYAMA, Tamito <rd6t-kjym at asahi-net.or.jp>


-----Original Message----- 
From: Thomas Dinges
Sent: Saturday, April 06, 2013 11:28 PM
To: bf-committers at blender.org
Subject: Re: [Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55847] trunk/blender: Part II of the Freestyle 
branch merger: modifications to the trunk code base.

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). 



More information about the Bf-committers mailing list