Blender Git Commits

Merge branch 'openvdb' into gooseberry

Conflicts:
build_files/buildbot/config/user-config-player-glibc211-i686.py
build_files/buildbot/config/user-config-player-glibc211-x86_64.py
build_files/scons/tools/Blender.py
intern/cycles/blender/blender_shader.cpp
intern/cycles/kernel/svm/svm_types.h
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/smoke.c
source/blender/makesdna/DNA_smoke_types.h
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_smoke.c

Merge branch 'master' into gooseberry

Conflicts:
source/blender/blenkernel/intern/idcode.c
source/blender/editors/interface/interface_templates.c

Merge branch 'master' into openvdb

Merge branch 'gooseberry' into temp_motionpaths

Conflicts:
source/blender/blenkernel/intern/object.c

Super hacky hack (not for master for sure) to stop blender for crashing
with scene audio recursion in mattieu's gooseberry edit in sequencer.

Will probably cause something else to explode but let's just guard
against this in the audio lib for now.

Blender release: Point submodules to a release branch

Tagging of those branches will happen after AHOY, once we're sure no
re-AHOY is needed.

OpenVDB: Disable it for blenderplayer buildbot target

OpenVDB: Tweaksfor scons and buildbot

Merge branch 'UI-graphical-redesign' into UI-experiments

Merge branch 'master' into UI-experiments

Merge branch 'master' into UI-graphical-redesign

Sequencer:

Add option to ommit strip name and info display.

Cycles: Merge density and color volume attributes if they both requested

This way we store quite reasonable amount of memory (density is stored as RGBA
textures, which ends up in gigabytes of RAM for hires smoke sims).

It's not really pretty implementation and we'll really need to support textures
with 1 and 3 channels instead of doing such packing, but we need to be able to
render some files here.

Cycles: Free hires smoke data from blender side after scene was fully synchronized

This happens if all object's smokes are backed to files and rendering is either
happening from command line of with locked interface.

The idea behind this change is to make as much memory available for path tracing
as possible, so after heavy swapping during synchronization period there's loads
of free memory to put important data back to RAM.

Gooseberry: Use more proper flag for psys reconstruction after memory optimization

Gooseberry: Fix for flickering grass

The issue was caused by memory optimization marking particle system to recalc,
and because of the way how particle flags works it was possible that it'll
cause particle's re-distribution. Now this memory optimization will act the
same as loading the file.

Would need to review if this fix is to go to master/cycles_memory branches
but for now it'll be cool to figure out what to do with the farm.

Fix outdated stub factory class for pointcache when Alembic is disabled.

Gooseberry Farm: Solve compilation error with strict flags

Minor theme change

Add an "Interface Style" theme option for flat vs. classic drawing

Adds an "Interface Style" menu containing the items "Flat" (default) and
"Classic". The classic option basically brings back widget outlines,
emboss, shading and old checkbox design.

Open design question:
Currently widget outlines, emboss and shading is hardcoded disabled for
the "Flat" option. Meaning that tweaks to their theme options don't have
any effect. I think it should be fine to just disable the theme buttons
for this, but I'm all ears for better approaches.

Requested by @campbellbarton and @ton