Commit: 274dc024f62c4d65cbcf6689462327068c4d2206
Author: Campbell Barton
Date: Fri Sep 9 15:38:27 2022 +1000
Branches: master
https://developer.blender.org/rB274dc024f62c4d65cbcf6689462327068c4d2206
Cleanup: format, trailing space
===================================================================
M source/blender/draw/intern/draw_command.hh
M source/blender/draw/intern/shaders/draw_resource_finalize_comp.glsl
M source/blender/draw/intern/shaders/draw_visibility_comp.glsl
M source/blender/editors/sculpt_paint/curves_sculpt_density.cc
M source/blender/gpu/metal/kernels/gpu_shader_fullscreen_blit_info.hh
M source/blender/gpu/metal/mtl_primitive.hh
===================================================================
diff --git a/source/blender/draw/intern/draw_command.hh
b/source/blender/draw/intern/draw_command.hh
index b9117580d91..46a9199a267 100644
--- a/source/blender/draw/intern/draw_command.hh
+++ b/source/blender/draw/intern/draw_command.hh
@@ -531,4 +531,4 @@ class DrawMultiBuf {
/** \} */
-}; // namespace blender::draw::command
\ No newline at end of file
+}; // namespace blender::draw::command
diff --git
a/source/blender/draw/intern/shaders/draw_resource_finalize_comp.glsl
b/source/blender/draw/intern/shaders/draw_resource_finalize_comp.glsl
index d834435e54e..511d4e49651 100644
--- a/source/blender/draw/intern/shaders/draw_resource_finalize_comp.glsl
+++ b/source/blender/draw/intern/shaders/draw_resource_finalize_comp.glsl
@@ -61,4 +61,4 @@ void main()
vec3 size_inv = safe_rcp(size);
infos_buf[resource_id].orco_add = -loc * size_inv;
infos_buf[resource_id].orco_mul = size_inv;
-}
\ No newline at end of file
+}
diff --git a/source/blender/draw/intern/shaders/draw_visibility_comp.glsl
b/source/blender/draw/intern/shaders/draw_visibility_comp.glsl
index 7ec58c8f919..86add2d1fe2 100644
--- a/source/blender/draw/intern/shaders/draw_visibility_comp.glsl
+++ b/source/blender/draw/intern/shaders/draw_visibility_comp.glsl
@@ -43,4 +43,4 @@ void main()
mask_visibility_bit();
}
}
-}
\ No newline at end of file
+}
diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_density.cc
b/source/blender/editors/sculpt_paint/curves_sculpt_density.cc
index c33ee5e0727..a37eb4bb560 100644
--- a/source/blender/editors/sculpt_paint/curves_sculpt_density.cc
+++ b/source/blender/editors/sculpt_paint/curves_sculpt_density.cc
@@ -137,11 +137,10 @@ struct DensityAddOperationExecutor {
/* Find UV map. */
VArraySpan<float2> surface_uv_map;
if (curves_id_orig_->surface_uv_map != nullptr) {
- surface_uv_map = surface_orig_->attributes()
- .lookup<float2>(curves_id_orig_->surface_uv_map,
ATTR_DOMAIN_CORNER);
- surface_uv_map_eval_ = surface_eval_->attributes()
-
.lookup<float2>(curves_id_orig_->surface_uv_map,
- ATTR_DOMAIN_CORNER);
+ surface_uv_map =
surface_orig_->attributes().lookup<float2>(curves_id_orig_->surface_uv_map,
+
ATTR_DOMAIN_CORNER);
+ surface_uv_map_eval_ = surface_eval_->attributes().lookup<float2>(
+ curves_id_orig_->surface_uv_map, ATTR_DOMAIN_CORNER);
}
if (surface_uv_map.is_empty()) {
report_missing_uv_map_on_original_surface(stroke_extension.reports);
diff --git
a/source/blender/gpu/metal/kernels/gpu_shader_fullscreen_blit_info.hh
b/source/blender/gpu/metal/kernels/gpu_shader_fullscreen_blit_info.hh
index 6af67ad44d2..469e488c176 100644
--- a/source/blender/gpu/metal/kernels/gpu_shader_fullscreen_blit_info.hh
+++ b/source/blender/gpu/metal/kernels/gpu_shader_fullscreen_blit_info.hh
@@ -20,4 +20,4 @@ GPU_SHADER_CREATE_INFO(fullscreen_blit)
.sampler(0, ImageType::FLOAT_2D, "imageTexture", Frequency::PASS)
.vertex_source("gpu_shader_fullscreen_blit_vert.glsl")
.fragment_source("gpu_shader_fullscreen_blit_frag.glsl")
- .do_static_compilation(true);
\ No newline at end of file
+ .do_static_compilation(true);
diff --git a/source/blender/gpu/metal/mtl_primitive.hh
b/source/blender/gpu/metal/mtl_primitive.hh
index 5aa7a533b95..b32854a04bf 100644
--- a/source/blender/gpu/metal/mtl_primitive.hh
+++ b/source/blender/gpu/metal/mtl_primitive.hh
@@ -97,4 +97,4 @@ static inline bool
mtl_vertex_count_fits_primitive_type(uint32_t vertex_count,
return false;
}
-} // namespace blender::gpu
\ No newline at end of file
+} // namespace blender::gpu
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
