blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Cleanup: format

This commit is contained in:
Chris Blackbourn 2023-01-20 11:43:28 +13:00
parent 79053a6ff7
commit bbeb37696d
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_operators/wm.py
View File

@ -1588,7 +1588,7 @@ class WM_OT_properties_edit(Operator):
self.default_string = rna_data["default"]
elif self.property_type in {'BOOL', 'BOOL_ARRAY'}:
self.default_bool = self._convert_new_value_array(rna_data["default"], bool, 32)
if self.property_type in {'FLOAT_ARRAY', 'INT_ARRAY', 'BOOL_ARRAY'}:
self.array_length = len(item[name])

3
source/blender/draw/intern/DRW_gpu_wrapper.hh
View File

@ -1012,7 +1012,8 @@ class TextureRef : public Texture {
* Dummy type to bind texture as image.
* It is just a GPUTexture in disguise.
*/
class Image {};
class Image {
};
static inline Image *as_image(GPUTexture *tex)
{

9
source/blender/geometry/intern/fillet_curves.cc
View File

@ -39,7 +39,8 @@ static void duplicate_fillet_point_data(const bke::CurvesGeometry &src_curves,
for (const int curve_i : curve_selection.slice(range)) {
const IndexRange src_points = src_points_by_curve[curve_i];
const IndexRange dst_points = dst_points_by_curve[curve_i];
const IndexRange offsets_range = bke::curves::per_curve_point_offsets_range(src_points, curve_i);
const IndexRange offsets_range = bke::curves::per_curve_point_offsets_range(src_points,
curve_i);
const OffsetIndices<int> offsets(all_point_offsets.slice(offsets_range));
threaded_slice_fill(src.slice(src_points), offsets, dst.slice(dst_points));
}
@ -75,7 +76,8 @@ static void calculate_result_offsets(const bke::CurvesGeometry &src_curves,
threading::parallel_for(selection.index_range(), 512, [&](IndexRange range) {
for (const int curve_i : selection.slice(range)) {
const IndexRange src_points = points_by_curve[curve_i];
const IndexRange offsets_range = bke::curves::per_curve_point_offsets_range(src_points, curve_i);
const IndexRange offsets_range = bke::curves::per_curve_point_offsets_range(src_points,
curve_i);
MutableSpan<int> point_offsets = dst_point_offsets.slice(offsets_range);
MutableSpan<int> point_counts = point_offsets.drop_back(1);
@ -456,7 +458,8 @@ static bke::CurvesGeometry fillet_curves(
for (const int curve_i : curve_selection.slice(range)) {
const IndexRange src_points = src_points_by_curve[curve_i];
const IndexRange offsets_range = bke::curves::per_curve_point_offsets_range(src_points, curve_i);
const IndexRange offsets_range = bke::curves::per_curve_point_offsets_range(src_points,
curve_i);
const OffsetIndices<int> offsets(all_point_offsets.slice(offsets_range));
const IndexRange dst_points = dst_points_by_curve[curve_i];
const Span<float3> src_positions = positions.slice(src_points);