Blender Git Loki

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28280:28283

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28254:28280

Render Branch: Fix missing AO pass with SSS materials, forgot to check for
this case in optimizations.

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28211:28254

Render Branch: Fix some alpha premul problems with mipmap files by moving
the premul code to imbuf, still a small difference that needs to be fixed,
but no very bright pixels anymore hopefully.

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28211:28234

Render Branch: Attemp to fix sss + irr cache render crash with displaying
cache samples.

Render Branch:
* Fix crash with NULL image texture.
* Add test for render cancel in deep shadow buffer compression.

Render Branch: SSS now works together with irradiance caching.

Render Branch: Fix mistake in imbuf changes, forgot to replace one free()
by MEM_freeN().

Render Branch: Fix merge full sample not working after cancelling render,
proper fix would be to get rid of G.afbreek entirely..

Render Branch: Fix for broken raytracing neighbour intersection test.

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blend -r28211:28225

fix for missing null pointer check.

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28202:28211

Render Branch:
* Forgot to mention this in last commit. Currently image loading will look
for an .tx file next to the specified image file, and if it exists, use
that instead automatically. It compares the dates and always used the newest
of the two.
* Fix uv y derivative being scaled wrong.
* Fix for possible use of invalid mipmap level -1.

Render Branch:

Imbuf module: some small refactoring and removing a lot of unused or old code
(about 6.5k lines), it's a bit drastic but can add back if it's still useful.

* Added a ImFileType struct with callbacks to make adding an file format type,
or making changes to the API easier.
* Move imbuf init/exit code into IMB_init()/IMB_exit() functions.
* Increased mipmap levels from 10 to 20, you run into this limit already with
a 2k image.
* Removed hamx, amiga, anim5 format support.
* Removed colormap saving, only simple colormap code now for reading tga.
* Removed gen_dynlibtiff.py, editing this is almost as much work as just
editing the code directly.
* Functions removed that were only used for sequencer plugin API:
IMB_anim_nextpic, IMB_clever_double, IMB_antialias, IMB_gamwarp,
IMB_scalefieldImBuf, IMB_scalefastfieldImBuf, IMB_onethird, IMB_halflace,
IMB_dit0, IMB_dit2, IMB_cspace

Image textures can now lazely load mipmap levels from files, so if an object
is far away only a lower level is loaded. This is supported for the .tx file
format as used by prman, which is basically a tiff image with all the mipmap
levels saved in it. I tested generating them using OpenImageIO maketx utility,
(there is no way to save these from Blender currently).

Added mipmap levels simplify option (couldn't think of a better name). This
makes it possible to force using lower resolution mipmap levels, which helps
reducing memory usage a lot when using .tx files.

Next: tile loading support, then swapping them in and out with a cache.

Render Branch: three utility functions:

* mul_v4_fl
* BLI_replace_extension: replace extension in a filename
* BLI_file_newer: test if one file is newer than the other

disable an assert, use a guess assignment instead.

Render Branch: fix for particle duplis not rendering from inside a dupligroup,
not sure why this check was here, will need to find out if something goes wrong.