Blender Git Loki

crash fix with other pointsources, forgot to initialize counts to 0...

Fixed a bug in keyblock compression

If the file was saved with compression and then saved over with Legacy
Keyblocks option, the compress flag was never cleared and file failed to
load.

Merge remote-tracking branch 'origin/master' into soc-2014-bge

OpenSubdiv: Fix issues with normals in CPU side tessellator

There's still some issues with NGons, but those seems to be caused
by the OpenSubdiv's evaluator API.

OpenSubdiv: Resolve crash when opening user preferences

Was caused by wrong OpenGL state, now it should always be set
properly for osd mesh draw.

TODO: We might want to reshuffle all the ogl init functions to
make it look more pretty.

Merge branch 'master' into opensubdiv-modifier

Merge branch 'soc-2014-viewport_context' of git.blender.org:blender into soc-2014-viewport_context

Conflicts:
source/blender/gpu/intern/gpu_select.c

Merge branch 'master' into soc-2014-viewport_context

Conflicts:
CMakeLists.txt

Merge branch 'master' into soc-2014-viewport_context

changed glew.h include to GPU_glew.h include in GPU_select.c

Merge remote-tracking branch 'upstream/master' into multiview

(removed the multiview splashscreen as well to prevent future issues and
not to increase the git repo size by much)

Conflicts:
release/datafiles/splash.png
source/blender/blenloader/intern/versioning_270.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/pipeline.c
source/blender/windowmanager/intern/wm_draw.c

gameengine: more tweaks to the scenegraph

Merge remote-tracking branch 'origin/master' into soc-2014-bge

game engine: scenegraph cleanup

removed a duplicate gpu include directory in editor/armature/CMakeLists.txt that was added by a merge

Cleanup: whitespace, also only keep file descriptions in cpp files

Pie Menus:

* Fix flickering in pie menus.
* Start from center position initially.
* Fix memory over-cleanup.
* All stroke selections in paint systems use pie menus.

Merge branch 'master' into pie-menus

Conflicts:
source/blender/editors/interface/interface_handlers.c
source/blender/editors/sculpt_paint/paint_ops.c
source/blender/editors/space_api/spacetypes.c

Remove `_` from _CASE_CODE_RETURN_STR, keep that for internal defines

Deleted unused cmake file.

This was committed accidentally, but does not contain usable code yet.