[Soc-2010-dev] merge plans

[Tom M]

HI Konrad,

good luck with your thesis and your job.  No problem that you haven't
had time to contribute, looking forward to it when you get some free
time though,

LetterRip

On Tue, Feb 8, 2011 at 11:17 PM, Konrad Kleine <konrad at konradwilhelm.de> wrote:
> Hi Tom,
>
> I'm planning to finish work on bump map painting
> (http://vimeo.com/13639081) as a separate patch for trunk. According to
> Brecht there are still some issues left to fix
> (http://projects.blender.org/tracker/index.php?func=detail&aid=23084&group_id=9&atid=127).
>
> A very small patch could be this "Auto Show Active Texture" feature:
> http://vimeo.com/13215410 if anybody is interested and the code isn't
> too messy.
>
> I want to work on a multi-layer-image when I finished my thesis. I'd
> love to work with an artist on this to get a good requirements
> engineering done and concentrate on the technical side of things afterwards.
>
> I'm sorry, but I haven't had much time during the past six month because
> I've been working on my thesis in a company (40h per week). I cannot
> create my patches before my thesis' deadline (March 4th).
>
> -Konrad-
>
> On 09.02.2011 03:31, Tom M wrote:
>> Nick,
>>
>> excellent to hear.  Anyone else have plans yet or did you all
>> unsubscribe at the end of GSoC :)
>>
>> LetterRip
>>
>> On Sun, Feb 6, 2011 at 11:10 PM, Nick Samarin<nicks1987 at bigmir.net>  wrote:
>>> Hi
>>>
>>> I plan to prepare my branch (nicks, Recast&Detour integration) for merge in
>>> a few weeks. I think there is a some work to do because the last update was
>>> in October.
>>> Best regards,
>>> Nick Samarin
>>> 2011/2/6 Tom M<letterrip at gmail.com>
>>>>
>>>> Hi all,
>>>>
>>>> we are inching closer and closer to Blender 2.6 being 'Done'.  Which
>>>> means that the hard work that you guys have done, as well as other
>>>> major branches, will be able to be merged into the main tree if they
>>>> are ready.
>>>>
>>>> I know that some of your projects were pretty much ready to merge at
>>>> the end of GSoC, other projects had parts of their project ready to
>>>> merge, while yet others had a bit more work they wanted to finish up.
>>>>
>>>> If you have a bit of free time, would be interested in hearing what
>>>> you feel the status of your project is, and also whether you think you
>>>> can find some time to get it merge ready etc.
>>>>
>>>> By end of May we think 2.6 final could occur, after which point an
>>>> orderly merging of branches can occur.  We are essentially in bug
>>>> fix/todo list only mode, so the changes to head are quite trivial and
>>>> should make life easier for getting ready to merge.
>>>>
>>>> Tom M.
>>>> LetterRip
>>>> _______________________________________________
>>>> Soc-2010-dev mailing list
>>>> Soc-2010-dev at blender.org
>>>> http://lists.blender.org/mailman/listinfo/soc-2010-dev
>>>
>>>
>>> _______________________________________________
>>> Soc-2010-dev mailing list
>>> Soc-2010-dev at blender.org
>>> http://lists.blender.org/mailman/listinfo/soc-2010-dev
>>>
>>>
>> _______________________________________________
>> Soc-2010-dev mailing list
>> Soc-2010-dev at blender.org
>> http://lists.blender.org/mailman/listinfo/soc-2010-dev
>>
> _______________________________________________
> Soc-2010-dev mailing list
> Soc-2010-dev at blender.org
> http://lists.blender.org/mailman/listinfo/soc-2010-dev
>