[Bf-committers] Tile Branche Merge

[Thomas Dinges]

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

Am 03.01.2012 15:44, schrieb Campbell Barton:
> +1, skipping commits just gives bigger headaches later - especially if
> done more then once it can become really horrible to track this down
> later on.
>
> On Wed, Jan 4, 2012 at 1:37 AM, Brecht Van Lommel
> <brechtvanlommel at pandora.be>  wrote:
>> Changes from these commits should be merged over as soon as possible,
>> otherwise they get lost. In my opinion, you should never skip commits
>> in a merge really, unless they are no longer relevant, it's too hard
>> to keep track of.
>>
>> Brecht.
>>
>> On Tue, Jan 3, 2012 at 2:58 PM, Thomas Dinges<blender at dingto.org>  wrote:
>>> For the record, due to file re-organisation, this merge is missing
>>> changes to the compositor nodes from SVN 42814, 42928, 43004.
>>>
>>> Am 03.01.2012 05:26, schrieb Thomas Dinges:
>>>> Hi Jeroen and others,
>>>> I merged the Trunk changes from the past 2 months into the tile branch.
>>>>
>>>> Tested it with simple node setup, worked great. I resloved some issues
>>>> in the merge, see commit message for details.
>>>> SVN: 43092
>>>>
>>>> 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
>> _______________________________________________
>> Bf-committers mailing list
>> Bf-committers at blender.org
>> http://lists.blender.org/mailman/listinfo/bf-committers
>
>


-- 
Thomas Dinges
Blender Developer, Artist and Musician

www.dingto.org