Blender Git Loki

SDL wrangler: Support loading SDL2 libraries of different names

Seems different distros might have different naming rules, so need
to adopt our code for that.

Fix T43156: Cycles incorrect final render, proper viewport with moblur disabled

Really stupid issue caused by typo in bitfield bit lead to bit conflict,

Not sure how it was done, could be some bad merge conflict resolve in the
original commit or just pure man stupidnes.

This is a nice example when having set of small test render scenes hooked
to the ctest would really help.

It's probably not that stopper issue (even tho still quite bad) since it
was made 2 months ago. But if we ever do 'a' this time it's a nice change
to include.

Fix T43311: using displacement shader crashes blender

Issue was caused by wrong order of scene device update, which could
lead to missing object flags in shader kernel.

This patch solves a bit more than that making sure objects flags are
always properly updated, so adding/removing volume BSDF will properly
reflect on viewport where camera might become being in volume and so.

Fix for security issue loading blend's

Auto-Execute option could be overridden by opening a startup.blend

Fix OpenGL Context freeing

Fix for regression in bmesh connect-pair

T42563 fix wasn't right, fortunately this doesn't fail in most cases.

Fix typo in OCIO configuration file

Fix T43204: Shrinkwrap constraint, project mode: Space ignored in bone case.

Own fault in rBb154aa8c060a60d to fix T42447... Reverted that commit, and added
kind of not-so-nice hack instead.

Note root of the issue comes from the special case we are doing here re 'Local'
space of parent-less objects. In that case, local space should be the same as
world one, but instead we apply the object rotation to it... This is inconsistent
with all other cases and could very well lead to other issues as T42447, but afraid
fixing that properly would be rather hairy - not to mention it would likely break
all existing riggings etc. :(

Should be safe for a 2.73a, shall we need it.

Fix T43208 material flickering in edit mode.

Happens because material setting now occurs in the derived mesh drawing
routine as it should. However that means that it also happens during
selection and that influenced the drawing state somehow.

In 2.72 this did not occur because material setting happened during draw
setting (skip or draw) instead of after the draw setting passed (so
selection would skip it by use another draw setting function). Of course
this violated design but worked.

Made it now so backbuffer selection does not enable materials (it's
redundant in those cases anyway).

This could be ported to a possible 'a' release but as is classic with
display code there may be some other places that it could backfire.

Tested fix with texture/vertex painting and selection which use
backbuffer for both subsurf and regular meshes and it seems to work OK.

Fix T43229: Knife-project regression (broke knife-project)

There have been quite a few issues with knife precision,
tested reports (T43229, T42864, T42459, T41164) and this works with all.

BMesh: Tweak behavior for select more/less

Stepping over faces gives overall nice results but it stopped wire edges from working.
Now step over wire too.

Fix invalid memory access in gradient brushes - could cause a crash in
MacOS.

This looks like an oldie and should not influence release, but if we do
make an 'a' build it's safe to include.

Report by Craig Jones, thanks!

Fix crash in texture paint sampling when sampling materials without
textures slots

Fix for GTest

Fix texture sampling with generative modifiers - sample backbuffer
returns indices in mesh face range

Fix T40257: Frustum culling not working properly

Instead of getting fancy this time, we'll just use Mahalin's simpler
fix. This may have slight performance impacts, but it is a lot simpler
than the previous fix and shouldn't cause as many bugs.

Revert "Fix T40257: Frustum culling not working properly"

This reverts commit 315609ec0c1e28eb12bde3e8bbd2a5b03672b1a9.

This fix still causes more issues than it solves.

Fix gtest linking on ubuntu and do minor cleanup.

Generally for build systems, libraries that do not depend on other
libraries, such as system libraries, OpenGL etc always go at the end.

We could even get rid of some duplicate dependency libraries here but
auto duplication by build systems and differences between OSs make this
difficult.

GTest still duplicates all libraries twice to solve some issues which is
weird (maybe libs are not sorted correctly for some reason? needs
investigation)

ugly modifier numbering "fix" for fracture modifier... just for the branch!

Merge remote-tracking branch 'refs/remotes/origin/master' into fracture_modifier

Conflicts:
source/blender/editors/space_outliner/outliner_draw.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_util.c