Blender Git Loki

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

Conflicts:
CMakeLists.txt
SConstruct
build_files/build_environment/install_deps.sh
build_files/scons/tools/Blender.py
build_files/scons/tools/btools.py
extern/CMakeLists.txt
extern/SConscript
extern/bullet2/CMakeLists.txt
intern/cycles/blender/blender_camera.cpp
intern/cycles/blender/blender_texture.cpp
intern/cycles/kernel/geom/geom_triangle_intersect.h
intern/cycles/kernel/kernel_compat_cpu.h
intern/cycles/kernel/svm/svm_voxel.h
intern/cycles/util/util_path.cpp
intern/ghost/intern/GHOST_ContextGLX.cpp
intern/iksolver/intern/IK_Solver.cpp
release/datafiles/locale
release/scripts/addons
release/scripts/startup/bl_ui/space_userpref.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/BKE_bvhutils.h
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/armature.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/editderivedmesh.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/mesh_remap.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenlib/intern/string.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/mesh/editmesh_knife.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/object/object_bake_api.c
source/blender/editors/space_graph/graph_ops.c
source/blender/editors/space_outliner/outliner_intern.h
source/blender/editors/space_outliner/outliner_tools.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_input.c
source/blender/editors/transform/transform_snap.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/SConscript
source/blender/makesrna/intern/SConscript
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_rigidbody.c
source/blender/modifiers/SConscript
source/blender/python/mathutils/mathutils_geometry.c
source/blender/render/extern/include/RE_render_ext.h
source/blender/render/intern/source/bake_api.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/pointdensity.c
source/blender/render/intern/source/renderdatabase.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_files.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/gameengine/Ketsji/BL_Action.cpp

Fix/workarounds for a couple of crashes.

Move Volume class definition to volume.h, also move some properties from
the VolumeManager there, added some more code to handle attributes.

Merge remote-tracking branch 'origin/master' into decklink

Conflicts:
source/gameengine/Ketsji/KX_KetsjiEngine.cpp

Correct comment (and add another one)

BGE: undo view matrix scaling but keep axis inverting.

Previous commit 9d18fd11 introduced the possibility to scale the modelview
matrix by setting a scale on the camera but this caused undesirable lighting
and dynamic side effects.
This commit reverts the scaling effect but keeps the axis inversion effect,
which was the purpose of the first commit anyway.
A negative/positive scale on the camera is applied respectively as -1/+1 scale
on the modelview matrix.

Decklink: patch cleanup before merge.

Only show widget select keymap items for widget groups with selectable widgets

Correct comment from previous commit

Make key maps for widgets visible in key map editor

For each editor that has widgets, we draw a "Widgets" category into it's key map list. Under this we have the key maps for the individual widget group types.

Having to hardcode the entries in keyconfig_utils.py is not so nice, but don't know of a better way to do this.

Merge branch 'master' into libquery-recursive

Merge branch 'master' into wiggly-widgets

small while loop changes

Start working on volume attributes.

Merge branch 'libquery-recursive' into asset-engine

Merge branch 'master' into asset-engine

Merge branch 'libquery-recursive' into id-remap

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

Merge branch 'master' into id-remap

Cleanup (remove some useless diff compared to master).

Merge branch 'master' into libquery-recursive