Blender Git Loki

'gmon.out' should have never been here

Merge remote-tracking branch 'origin/blender2.8' into pbr-viewport

Fix build for gameengine

Merge remote-tracking branch 'origin/blender2.8' into pbr-viewport

Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/space_view3d/drawobject.c

Merge remote-tracking branch 'origin/master' into blender2.8

Conflicts:
source/blender/blenloader/intern/versioning_defaults.c

Merge branch 'master' into soc-2016-multiview

Put spaces in the parameter names of the shader node

Removed code that isn't in use anymore

Code style cleanup

Cycles: Fix another OpenCL logging issue

Previously an error message would be printed whenever the OpenCL build produced output.
However, some frameworks seem to print extra information even if the build succeeded, so now the actual returned error is checked as well.
When --debug-cycles is activated, the build output will always be printed, otherwise it only gets printed if there was an error.

Implement new rotation manipulators

Add view aligned circle manipulator for free translation

Merge remote-tracking branch 'origin/blender2.8' into pbr-merge

Conflicts:
source/blender/blenloader/intern/versioning_defaults.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/gpu/CMakeLists.txt
source/blender/gpu/GPU_framebuffer.h
source/blender/gpu/GPU_material.h
source/blender/gpu/GPU_shader.h
source/blender/gpu/intern/gpu_codegen.c
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_framebuffer.c
source/blender/gpu/intern/gpu_material.c
source/blender/gpu/intern/gpu_shader.c
source/blender/makesdna/DNA_view3d_types.h

OpenGL: draw lamp objects with new imm mode

Previous commit in blender2.8 branch had some... unintended
consequences. This one should be better.

Part of T49043. Also uses new matrix API (T49450)

Remove unused includes

Use more modern OpenGL for arrow manipulator drawing

Could/should do hings like sharing VBOs between manipulators, using own shader, use GPU_matrix API, etc but would need to figure out requirements some more first.

Merge remote-tracking branch 'origin/master' into pbr-merge

Conflicts:
source/blender/editors/space_view3d/view3d_draw.c

Revert "OpenGL: draw lamp objects with new imm mode"

This reverts commit 7a0377e22ba8e5d3a79e76699b00743e0eca757e.

change path's to literal strings, to prevent escape issues with windows paths.

OpenGL: draw lamp objects with new imm mode

Part of T49043. Also uses new matrix API (T49450)