Blender Git Loki

Merge branch 'master' into soc-2014-bge

Conflicts:
source/blender/blenkernel/intern/object.c
source/gameengine/Ketsji/KX_KetsjiEngine.cpp
source/gameengine/Ketsji/KX_PythonInit.cpp

gameengine vehicle controller: removing partially removed constant

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.

Merge branch 'master' into gooseberry

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

Merge remote-tracking branch 'origin/master' into temp-menu_shadow_theme_color

refactored function for loading fracture modifier out

initial support for UV-correct in vertex slide

Working but needs to be clever and select the right faces to project from
(currently causes holes in the UV layout)

Merge branch 'master' into temp_custom_loop_normals

Merge branch 'master' into temp_custom_loop_normals

Conflicts:
release/datafiles/blender_icons.svg
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/editors/include/UI_icons.h
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

Merge branch 'master' into gooseberry

Conflicts:
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c
source/blender/makesrna/intern/rna_modifier.c

Merge branch 'master' into asset-experiments

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

Merge branch 'master' into mesh-transfer-data

Conflicts:
source/blender/editors/space_outliner/outliner_draw.c
source/blender/makesrna/intern/rna_modifier.c

Fix for left/right sequencer image strip not loading (since recent cleanup for review)

From review: add a suffix to arrays names

Merge branch 'master' into mesh-transfer-data

Conflicts:
source/blender/editors/object/object_data_transfer.c

Merge branch 'master' into mesh-transfer-data

Conflicts:
source/blender/blenkernel/BKE_mesh_remap.h

Merge branch 'master' into gooseberry

Add initial compositing node API, compositing code already becomes too
redundant and hard for prototyping. This will make things easier.