Blender Git Loki

Blender Git "pbr-viewport" branch commits.

November 2, 2016, 18:52 (GMT)
the maxz and minz shaders were not being compiled
November 1, 2016, 21:00 (GMT)
Fix left over from merge

Linux did not mind with them, but luckily Linux is more strict
October 21, 2016, 12:59 (GMT)
Cleanups to make the patch lean
October 21, 2016, 12:51 (GMT)
'gmon.out' should have never been here
October 21, 2016, 12:50 (GMT)
Merge remote-tracking branch 'origin/blender2.8' into pbr-viewport
October 21, 2016, 12:29 (GMT)
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
October 20, 2016, 21:40 (GMT)
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
October 20, 2016, 19:37 (GMT)
Merge remote-tracking branch 'origin/master' into pbr-merge

Conflicts:
source/blender/editors/space_view3d/view3d_draw.c
October 20, 2016, 18:29 (GMT)
Merge commit 'e5c32844678e292a084d6d97eb2d4ba6affc217d' into pbr-merge

Conflicts:
source/blender/gpu/shaders/gpu_shader_material.glsl
October 20, 2016, 18:23 (GMT)
Merge commit '4b046c530d3e14d7737c4770b9ae07942f4c6047' into pbr-merge

Conflicts:
source/blender/nodes/shader/nodes/node_shader_fresnel.c
October 20, 2016, 18:16 (GMT)
Merge commit '4b046c530d3e14d7737c4770b9ae07942f4c6047^' into pbr-merge
October 20, 2016, 17:44 (GMT)
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
October 20, 2016, 17:26 (GMT)
Merge commit '7830ec54186e8b05a366775e02c6457eb83814a3' into pbr-merge

Conflicts:
source/blender/nodes/shader/nodes/node_shader_texture.c
October 20, 2016, 17:00 (GMT)
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
Revision a84794b by Clment Fukhaut (pbr-viewport)
September 4, 2016, 16:56 (GMT)
Worked on HiZRaytracing
Revision 20fa91b by Clment Fukhaut (pbr-viewport)
July 5, 2016, 21:56 (GMT)
Early Hi-Z raytrace implementation (not functional yet)
Revision ddfae3d by Clment Fukhaut (pbr-viewport)
June 16, 2016, 17:02 (GMT)
I should sleep sometimes
Revision 4cae0cb by turjuque (pbr-viewport)
June 15, 2016, 23:47 (GMT)
Fix texelFetch for older opengl version.
Revision 22c8301 by turjuque (pbr-viewport)
June 15, 2016, 23:46 (GMT)
Fix Crash.
Revision d2ec40b by turjuque (pbr-viewport)
June 6, 2016, 16:29 (GMT)
Fixed crash with no material meshes
Tehnyt: Miika HämäläinenViimeksi p?ivitetty: 07.11.2014 14:18 MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021