Merge branch 'master' into xr-dev

5 files changed, 7 insertions, 6 deletions

diff --git a/source/blender/draw/DRW_engine.h b/source/blender/draw/DRW_engine.h
index 5b3d262ac66..dec7a22aadb 100644
--- a/source/blender/draw/DRW_engine.h
+++ b/source/blender/draw/DRW_engine.h
@@ -222,7 +222,7 @@ void DRW_opengl_context_activate(bool drw_state);
 void DRW_draw_cursor_2d_ex(const struct ARegion *region, const float cursor[2]);
 
 void DRW_cdlayer_attr_aliases_add(struct GPUVertFormat *format,
-                                  char *base_name,
+                                  const char *base_name,
                                   const struct CustomData *data,
                                   const struct CustomDataLayer *cl,
                                   bool is_active_render,
diff --git a/source/blender/draw/engines/eevee_next/eevee_view.hh b/source/blender/draw/engines/eevee_next/eevee_view.hh
index 95ec1760c63..fb74412f557 100644
--- a/source/blender/draw/engines/eevee_next/eevee_view.hh
+++ b/source/blender/draw/engines/eevee_next/eevee_view.hh
@@ -41,7 +41,7 @@ class ShadingView {
   /** Matrix to apply to the viewmat. */
   const float (*face_matrix_)[4];
 
-  /** Post-fx modules. */
+  /** Post-FX modules. */
   // DepthOfField dof_;
   // MotionBlur mb_;
   VelocityView velocity_;
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_point_varying_color_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_point_varying_color_frag.glsl
index 4962fb01c88..b0da035ef09 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_point_varying_color_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_point_varying_color_frag.glsl
@@ -5,7 +5,7 @@ void main()
   float dist_squared = dot(centered, centered);
   const float rad_squared = 0.25;
 
-  // round point with jaggy edges
+  /* Round point with jaggy edges. */
   if (dist_squared > rad_squared) {
     discard;
   }
diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c
index dc4e34c64cb..f846251c66b 100644
--- a/source/blender/draw/intern/draw_cache.c
+++ b/source/blender/draw/intern/draw_cache.c
@@ -3412,8 +3412,8 @@ void DRW_batch_cache_free_old(Object *ob, int ctime)
 /** \} */
 
 void DRW_cdlayer_attr_aliases_add(GPUVertFormat *format,
-                                  char *base_name,
-                                  const CustomData *data,
+                                  const char *base_name,
+                                  const CustomData *UNUSED(data),
                                   const CustomDataLayer *cl,
                                   bool is_active_render,
                                   bool is_active_layer)
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c
index 7cdc42b5a81..188d9114cd7 100644
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@ -1238,7 +1238,8 @@ static void drw_sculpt_generate_calls(DRWSculptCallbackData *scd)
                    &update_frustum,
                    &draw_frustum,
                    (void (*)(void *, GPU_PBVH_Buffers *))sculpt_draw_cb,
-                   scd, scd->use_mats);
+                   scd,
+                   scd->use_mats);
 
   if (SCULPT_DEBUG_BUFFERS) {
     int debug_node_nr = 0;