Blender Git Loki

the maxz and minz shaders were not being compiled

Fix left over from merge

Linux did not mind with them, but luckily Linux is more strict

Cleanups to make the patch lean

'gmon.out' should have never been here

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

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/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

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

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

Merge commit 'e5c32844678e292a084d6d97eb2d4ba6affc217d' into pbr-merge

Conflicts:
source/blender/gpu/shaders/gpu_shader_material.glsl

Merge commit '4b046c530d3e14d7737c4770b9ae07942f4c6047' into pbr-merge

Conflicts:
source/blender/nodes/shader/nodes/node_shader_fresnel.c

Merge commit '4b046c530d3e14d7737c4770b9ae07942f4c6047^' into pbr-merge

Merge commit '2b240b0430787814316f3b3166453c6d85b017f3' into pbr-merge

Conflicts:
release/datafiles/splash.png
release/datafiles/splash_2x.png
source/blender/gpu/CMakeLists.txt
source/blender/gpu/intern/gpu_shader.c

Merge commit '7830ec54186e8b05a366775e02c6457eb83814a3' into pbr-merge

Conflicts:
source/blender/nodes/shader/nodes/node_shader_texture.c

Merge commit '9269574089a742130f02c0a1184a19d94f0e665d' into pbr-online

Merge conflicts fixes include fix on ob->reflectionplane for write and
read, and a few manual fixes to account for the ID remap changes

Conflicts:
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/world.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/gpu/GPU_draw.h
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_material.c
source/blender/gpu/intern/gpu_texture.c
source/blender/gpu/shaders/gpu_shader_vertex_world.glsl

Worked on HiZRaytracing

Early Hi-Z raytrace implementation (not functional yet)

I should sleep sometimes

Fix texelFetch for older opengl version.

Fix Crash.

Fixed crash with no material meshes