Blender Git Loki

TileBranch
* Removed storage of tiles to disc. in order to support buffer caching
* Cleaned up spaces/tabs

Jeroen

Changing the worldTransform and localTransform python attributes to use BLI_math to simplify the code.

fix compile: doubleedgemask define will only be available when trunk get merged in tile again

including the non implemented nodes in the COM_Convert.cpp to make it easy to see what's missing
(thanks bash tools :)

cleanup - removing unecessary #includes
(COM_InputSocket.h and COM_OutputSocket.h - as suggested by Jeroen Bakker)

Color Matte Node - tiles
thanks Jeroen Bakker for review + small corrections

Tile - Chroma Matte Node
note - shadow adjust (c->t3) and lift (c->fsize) are no longer used in the algorith (since somewhere in 2.5 dev).
The properties are still in ChromaNode and have a RNA property.

This should be address in trunk, not in Tile I think.
If those are parameters needed for a more robust algorith we bring it to Tile later.

svn merge ^/trunk/blender -r42742:43270

conflicted files I had to fix manually:
--------------------------------------
wm.py
properties_particle.py
properties_game.py
rna_scene.c
KX_BlenderInputDevice.h
BL_BlenderDataConversion.cpp
GPG_Application.cpp
BL_Material.cpp
KX_FontObject.cpp

Separate Combine YCbCr nodes + fix for YUV
------------------------------------------
YUV was missing in COM_Converter.cpp

Sep/Comb YCC could even inherit each other (given the setMode function is th same). But I think it's fine to duplicate that. Thoughts?

Also, I'm not using m_privateprops C++ like naming. As we are not doing this in the other nodes.

reviewed/approved by Jeroen Bakker.

Refactor of Distance Matte Node/Operation
reinforcing that all Matte operations should output the alpha channel (VALUE).
thus it needs the SetAlpha operation (instead of the split Alpha)

Distance Matte node - Tile
this matte operation is outputting RGBA (in oppose to only the A value as some other mattes).
The reason for this is to avoid and extra operation to get the main output ready (which is always needed
for the preview so we may as well get it done).

Instead of using the SetAlphaOperation I'm using SeparateChannel to extract the alpha from the output
of the Distance Matte operation.

Jeroen, I think it's simpler if I go ahead and commit the nodes if I think they are good.
If there are problems it'll be simpler to fix in svn since they should be small.

Separate+Combine YUV + Luminance Matte node for Tile
reviewed by Jeroen Bakker

TileBranch
* added preview to the DifferenceMatteNode

Tile branch
* added the simple start (4star) glare operation
* cleaned up the FogGlowImage operation.

In the trunk implementation there is an error in the formula when using the 'Quality' setting
low quality will create larger stars. In the new implementation all will be done in the high quality setting.

MapUV Node - Tile

This node requires an EWA filter to read the final value.
In COM_MemoryBuffer.cpp I copied the functions from texture.c
The reason for copying and not re-using from a header is to allow
for further refactoring. Basically the codes should be independent.

The EWA happens automatically when you call the read function with two extra arguments
(dx and dy, calculated from a differential filter pass before in the operation).

Good news, the result works better than trunk. In trunk the edges of the image get black,
here it works all fine.

TileBranch
* added the basic implementation of the GlareNode
* only implemented the FogGlow
* all others will also do fogglow

FogGlowImageOperation calculates a BokehImage for the glow. This way the BokehBlur is reused to calculate the actual blur
GlareThresholdOperation will generate the image where the effect must take place. (BTL function in the old compositor)

Merge changes from commits 42814, 42928, 43004 into new compositing nodes code,
to complete the previous merge commit.

Tile Branch
* make sure that OpenCL initialization works for the MS compiler. Issue concerned the way when local variables are initialized.
GNU based compilers initialize locals when the variable is defined.
MS compiler first initialize all local variables, before any code will be executed.

The arrays are now initialized in code to make sure it compiles on MS compiler.

Tile branch
* Enabled OpenCL for the compositor
* Remove not working Threadind models of the compositor
* OpenCL will only work when the COM_TM_QUEUE is enabled and COM_OPENCL_ENABLED
* Updated the scons build system

Merging Trunk changes into Tile branch:
SVN Range: 42300-43091.

Resolved issues:
* Re-added compat code for new Compositor in readfile.c
* Matrix multiplication order fixes, see commit 42670.

Tested compile on windows, branch looks good after merge! :)