Blender Git Commit Log
Git Commits -> Revision df558cb
Revision df558cb by YimingWu (lanpr-under-gp, lineart-bvh, lineart-shadow, temp-lineart-contained, temp_lineart_contained) September 10, 2020, 01:56 (GMT) |
Merge remote-tracking branch 'origin/master' into lanpr-under-gp # Conflicts: # source/blender/editors/include/ED_geometry.h # source/blender/editors/lineart/lineart_ops.c # source/blender/editors/mesh/editmesh_intersect.c # source/blender/editors/object/object_facemap_ops.c # source/blender/gpu/CMakeLists.txt # source/blender/gpu/intern/gpu_batch.cc # source/blender/gpu/intern/gpu_context_private.hh # source/blender/gpu/intern/gpu_immediate.cc # source/blender/gpu/intern/gpu_immediate_private.hh # source/blender/gpu/intern/gpu_platform_private.hh # source/blender/gpu/intern/gpu_primitive_private.h # source/blender/gpu/intern/gpu_query.cc # source/blender/gpu/opengl/gl_batch.cc # source/blender/gpu/opengl/gl_context.cc # source/blender/gpu/opengl/gl_drawlist.cc # source/blender/gpu/opengl/gl_immediate.cc # source/blender/python/intern/bpy_rna_ui.h |
Commit Details:
Full Hash: df558cb6056a2d3e157cf45cfe6583012958d300
Parent Commits: 501d064, d2d3ab0