[Bf-blender-cvs] [a603bb34591] master: Cleanup: clang-format
Campbell Barton
noreply at git.blender.org
Mon Dec 13 23:47:26 CET 2021
Commit: a603bb34591c8b68977b026204658ce602a5dae6
Author: Campbell Barton
Date: Tue Dec 14 09:42:44 2021 +1100
Branches: master
https://developer.blender.org/rBa603bb34591c8b68977b026204658ce602a5dae6
Cleanup: clang-format
===================================================================
M intern/cycles/scene/object.cpp
M source/blender/makesdna/intern/dna_defaults.c
M source/blender/makesrna/intern/rna_gpencil_modifier.c
===================================================================
diff --git a/intern/cycles/scene/object.cpp b/intern/cycles/scene/object.cpp
index 77c6c6614e3..05f6f6ce197 100644
--- a/intern/cycles/scene/object.cpp
+++ b/intern/cycles/scene/object.cpp
@@ -533,7 +533,8 @@ void ObjectManager::device_update_object_transform(UpdateObjectTransformState *s
void ObjectManager::device_update_prim_offsets(Device *device, DeviceScene *dscene, Scene *scene)
{
BVHLayoutMask layout_mask = device->get_bvh_layout_mask();
- if (layout_mask != BVH_LAYOUT_METAL && layout_mask != BVH_LAYOUT_MULTI_METAL && layout_mask != BVH_LAYOUT_MULTI_METAL_EMBREE) {
+ if (layout_mask != BVH_LAYOUT_METAL && layout_mask != BVH_LAYOUT_MULTI_METAL &&
+ layout_mask != BVH_LAYOUT_MULTI_METAL_EMBREE) {
return;
}
diff --git a/source/blender/makesdna/intern/dna_defaults.c b/source/blender/makesdna/intern/dna_defaults.c
index 6c8b4d0acb1..1d4257328a4 100644
--- a/source/blender/makesdna/intern/dna_defaults.c
+++ b/source/blender/makesdna/intern/dna_defaults.c
@@ -556,7 +556,7 @@ const void *DNA_default_table[SDNA_TYPE_MAX] = {
SDNA_DEFAULT_DECL(LengthGpencilModifierData),
SDNA_DEFAULT_DECL(DashGpencilModifierData),
SDNA_DEFAULT_DECL(DashGpencilModifierSegment),
- SDNA_DEFAULT_DECL(ShrinkwrapGpencilModifierData)
+ SDNA_DEFAULT_DECL(ShrinkwrapGpencilModifierData),
};
#undef SDNA_DEFAULT_DECL
#undef SDNA_DEFAULT_DECL_EX
diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c
index 7ca77e1c290..e06aac31124 100644
--- a/source/blender/makesrna/intern/rna_gpencil_modifier.c
+++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c
@@ -3491,9 +3491,8 @@ static void rna_def_modifier_gpencillength(BlenderRNA *brna)
prop = RNA_def_property(srna, "random_start_factor", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "rand_start_fac");
RNA_def_property_ui_range(prop, -10.0f, 10.0f, 0.1, 1);
- RNA_def_property_ui_text(prop,
- "Random Start Factor",
- "Size of random length added to the start of each stroke");
+ RNA_def_property_ui_text(
+ prop, "Random Start Factor", "Size of random length added to the start of each stroke");
RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
prop = RNA_def_property(srna, "random_end_factor", PROP_FLOAT, PROP_NONE);
More information about the Bf-blender-cvs
mailing list