Commit: 89b4dff90811e76afa96c8a4d73f4cf5944a4571 Author: Sriharsha Kotcharlakot Date: Tue Jul 21 12:59:01 2020 +0530 Branches: soc-2020-fluid-tools https://developer.blender.org/rB89b4dff90811e76afa96c8a4d73f4cf5944a4571
Merge branch 'master' into soc-2020-fluid-tools =================================================================== =================================================================== diff --cc source/blender/draw/engines/overlay/overlay_private.h index 722f6b840ae,efb9594f499..f6b88a2bf26 --- a/source/blender/draw/engines/overlay/overlay_private.h +++ b/source/blender/draw/engines/overlay/overlay_private.h @@@ -620,10 -621,8 +621,9 @@@ GPUShader *OVERLAY_shader_paint_weight( GPUShader *OVERLAY_shader_paint_wire(void); GPUShader *OVERLAY_shader_particle_dot(void); GPUShader *OVERLAY_shader_particle_shape(void); - GPUShader *OVERLAY_shader_pointcloud_dot(void); GPUShader *OVERLAY_shader_sculpt_mask(void); GPUShader *OVERLAY_shader_volume_velocity(bool use_needle); +GPUShader *OVERLAY_shader_volume_gridlines(bool color_with_flags, bool color_range); GPUShader *OVERLAY_shader_wireframe(bool custom_bias); GPUShader *OVERLAY_shader_wireframe_select(void); GPUShader *OVERLAY_shader_xray_fade(void); _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
