[Bf-committers] Tile Branche Merge

[Brecht Van Lommel]

I'll merge over the commits, it's not much work for me. It's just
something you need to check and ensure carefully when merging.

Brecht.

On Tue, Jan 3, 2012 at 5:34 PM, Thomas Dinges <blender at dingto.org> wrote:
> Hi,
> Ok I see the issue here, I checked the code but have no idea how to fix
> it, the compositor code changed totally. Sorry Brecht!
>
> In general:
> Imho, the merge was needed though, as it won't become easier to merge 3
> months of changes, 2 months was already not fun.
>
> So I would ask you Jeroen, if you could please check on the changes and
> adapt them.
> On the one hand you search for new developers to port nodes, on the
> other hand the branch does not compile anymore due to build
> system/library changes in Trunk. ;-)
> This way, I am afraid you won't find new devs so quickly.
>
> Anyway ,if this is unacceptable, I can simply revert the merge commit. I
> already spend three hours last night on merging this, because I wanted
> to bring this great project a step forward and make it possible again to
> build it easily without local modifications. If this caused more trouble
> then benefit, as I said I can simply revert the changes, but won't
> bother in the future about it either then.
>
> Thomas
>
> Am 03.01.2012 17:02, schrieb Brecht Van Lommel:
>> The issue still remains though, by skipping these commits, the
>> fixes/changes will be missing in the new compositing nodes. So they
>> should get ported and I would still strongly suggest to do this
>> immediately. But if not, somehow someone still has to remember to do
>> it later on...
>>
>> Brecht.
>>
>> On Tue, Jan 3, 2012 at 4:08 PM, Thomas Dinges<blender at dingto.org>  wrote:
>>> Sorry, I was not telling this correct. :)
>>>
>>> The 3 revisions are merged of course, and all the changes in
>>> source/blender/nodes are there, but they did not get ported to the new
>>> compo system in /source/blender/compositor. This therefore is part of
>>> the branch work / porting compositor to new system, rather than a merge
>>> task.
>>>
>>> Regards,
>>> Thomas
>>>
> --
> Thomas Dinges
> Blender Developer, Artist and Musician
>
> www.dingto.org
>
> _______________________________________________
> Bf-committers mailing list
> Bf-committers at blender.org
> http://lists.blender.org/mailman/listinfo/bf-committers