[Bf-blender-cvs] [32f7495e5a2] master: Cleanup: clang-format
Campbell Barton
noreply at git.blender.org
Fri May 8 11:02:40 CEST 2020
Commit: 32f7495e5a2debb0abefd4728d55a4dd2fa1f5c0
Author: Campbell Barton
Date: Fri May 8 19:02:03 2020 +1000
Branches: master
https://developer.blender.org/rB32f7495e5a2debb0abefd4728d55a4dd2fa1f5c0
Cleanup: clang-format
===================================================================
M source/blender/blenkernel/BKE_gpencil_modifier.h
M source/blender/blenkernel/BKE_modifier.h
M source/blender/blenkernel/intern/DerivedMesh.c
M source/blender/blenkernel/intern/cloth.c
M source/blender/blenkernel/intern/fluid.c
M source/blender/blenkernel/intern/gpencil_modifier.c
M source/blender/blenkernel/intern/modifier.c
M source/blender/blenkernel/intern/multires.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/particle_system.c
M source/blender/blenlib/intern/noise.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_250.c
M source/blender/blenloader/intern/versioning_legacy.c
M source/blender/draw/engines/overlay/overlay_extra.c
M source/blender/draw/intern/draw_cache_impl_mesh.c
M source/blender/editors/gpencil/gpencil_armature.c
M source/blender/editors/mesh/editmesh_loopcut.c
M source/blender/editors/object/object_edit.c
M source/blender/editors/object/object_modifier.c
M source/blender/editors/physics/particle_edit.c
M source/blender/makesrna/intern/rna_cloth.c
M source/blender/modifiers/intern/MOD_array.c
M source/blender/modifiers/intern/MOD_correctivesmooth.c
M source/blender/modifiers/intern/MOD_laplaciandeform.c
M source/blender/modifiers/intern/MOD_meshsequencecache.c
M source/blender/modifiers/intern/MOD_surfacedeform.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_gpencil_modifier.h b/source/blender/blenkernel/BKE_gpencil_modifier.h
index cff081dd04a..1a8e90ac30c 100644
--- a/source/blender/blenkernel/BKE_gpencil_modifier.h
+++ b/source/blender/blenkernel/BKE_gpencil_modifier.h
@@ -267,7 +267,7 @@ void BKE_gpencil_modifier_free(struct GpencilModifierData *md);
bool BKE_gpencil_modifier_unique_name(struct ListBase *modifiers, struct GpencilModifierData *gmd);
bool BKE_gpencil_modifier_depends_ontime(struct GpencilModifierData *md);
struct GpencilModifierData *BKE_gpencil_modifiers_findby_type(struct Object *ob,
- GpencilModifierType type);
+ GpencilModifierType type);
struct GpencilModifierData *BKE_gpencil_modifiers_findny_name(struct Object *ob, const char *name);
void BKE_gpencil_modifier_copydata_generic(const struct GpencilModifierData *md_src,
struct GpencilModifierData *md_dst);
@@ -277,11 +277,11 @@ void BKE_gpencil_modifier_copydata_ex(struct GpencilModifierData *md,
struct GpencilModifierData *target,
const int flag);
void BKE_gpencil_modifiers_foreach_ID_link(struct Object *ob,
- GreasePencilIDWalkFunc walk,
- void *userData);
+ GreasePencilIDWalkFunc walk,
+ void *userData);
void BKE_gpencil_modifiers_foreach_tex_link(struct Object *ob,
- GreasePencilTexWalkFunc walk,
- void *userData);
+ GreasePencilTexWalkFunc walk,
+ void *userData);
bool BKE_gpencil_has_geometry_modifiers(struct Object *ob);
bool BKE_gpencil_has_time_modifiers(struct Object *ob);
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index 1295f331461..a4bf86f61f3 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -365,10 +365,12 @@ void BKE_modifier_free(struct ModifierData *md);
bool BKE_modifier_unique_name(struct ListBase *modifiers, struct ModifierData *md);
void BKE_modifier_copydata_generic(const struct ModifierData *md,
- struct ModifierData *target,
- const int flag);
+ struct ModifierData *target,
+ const int flag);
void BKE_modifier_copydata(struct ModifierData *md, struct ModifierData *target);
-void BKE_modifier_copydata_ex(struct ModifierData *md, struct ModifierData *target, const int flag);
+void BKE_modifier_copydata_ex(struct ModifierData *md,
+ struct ModifierData *target,
+ const int flag);
bool BKE_modifier_depends_ontime(struct ModifierData *md);
bool BKE_modifier_supports_mapping(struct ModifierData *md);
bool BKE_modifier_supports_cage(struct Scene *scene, struct ModifierData *md);
@@ -376,8 +378,11 @@ bool BKE_modifier_couldbe_cage(struct Scene *scene, struct ModifierData *md);
bool BKE_modifier_is_correctable_deformed(struct ModifierData *md);
bool BKE_modifier_is_same_topology(ModifierData *md);
bool BKE_modifier_is_non_geometrical(ModifierData *md);
-bool BKE_modifier_is_enabled(const struct Scene *scene, struct ModifierData *md, int required_mode);
-void BKE_modifier_set_error(struct ModifierData *md, const char *format, ...) ATTR_PRINTF_FORMAT(2, 3);
+bool BKE_modifier_is_enabled(const struct Scene *scene,
+ struct ModifierData *md,
+ int required_mode);
+void BKE_modifier_set_error(struct ModifierData *md, const char *format, ...)
+ ATTR_PRINTF_FORMAT(2, 3);
bool BKE_modifier_is_preview(struct ModifierData *md);
void BKE_modifiers_foreach_object_link(struct Object *ob, ObjectWalkFunc walk, void *userData);
@@ -388,9 +393,9 @@ struct ModifierData *BKE_modifiers_findby_type(struct Object *ob, ModifierType t
struct ModifierData *BKE_modifiers_findny_name(struct Object *ob, const char *name);
void BKE_modifiers_clear_errors(struct Object *ob);
int BKE_modifiers_get_cage_index(struct Scene *scene,
- struct Object *ob,
- int *r_lastPossibleCageIndex,
- bool is_virtual);
+ struct Object *ob,
+ int *r_lastPossibleCageIndex,
+ bool is_virtual);
bool BKE_modifiers_is_modifier_enabled(struct Object *ob, int modifierType);
bool BKE_modifiers_is_softbody_enabled(struct Object *ob);
@@ -418,15 +423,15 @@ typedef struct CDMaskLink {
* final_datamask is required at the end of the stack.
*/
struct CDMaskLink *BKE_modifier_calc_data_masks(struct Scene *scene,
- struct Object *ob,
- struct ModifierData *md,
- struct CustomData_MeshMasks *final_datamask,
- int required_mode,
- ModifierData *previewmd,
- const struct CustomData_MeshMasks *previewmask);
+ struct Object *ob,
+ struct ModifierData *md,
+ struct CustomData_MeshMasks *final_datamask,
+ int required_mode,
+ ModifierData *previewmd,
+ const struct CustomData_MeshMasks *previewmask);
struct ModifierData *BKE_modifier_get_last_preview(struct Scene *scene,
- struct ModifierData *md,
- int required_mode);
+ struct ModifierData *md,
+ int required_mode);
typedef struct VirtualModifierData {
ArmatureModifierData amd;
@@ -436,7 +441,7 @@ typedef struct VirtualModifierData {
} VirtualModifierData;
struct ModifierData *BKE_modifiers_get_virtual_modifierlist(const struct Object *ob,
- struct VirtualModifierData *data);
+ struct VirtualModifierData *data);
/* ensure modifier correctness when changing ob->data */
void BKE_modifiers_test_object(struct Object *ob);
@@ -454,27 +459,27 @@ const char *BKE_modifier_path_relbase_from_global(struct Object *ob);
* If the modifier data is already original, return it as-is. */
struct ModifierData *BKE_modifier_get_original(struct ModifierData *md);
struct ModifierData *BKE_modifier_get_evaluated(struct Depsgraph *depsgraph,
- struct Object *object,
- struct ModifierData *md);
+ struct Object *object,
+ struct ModifierData *md);
/* wrappers for modifier callbacks that ensure valid normals */
struct Mesh *BKE_modifier_modify_mesh(ModifierData *md,
- const struct ModifierEvalContext *ctx,
- struct Mesh *me);
+ const struct ModifierEvalContext *ctx,
+ struct Mesh *me);
void BKE_modifier_deform_verts(ModifierData *md,
- const struct ModifierEvalContext *ctx,
- struct Mesh *me,
- float (*vertexCos)[3],
- int numVerts);
+ const struct ModifierEvalContext *ctx,
+ struct Mesh *me,
+ float (*vertexCos)[3],
+ int numVerts);
void BKE_modifier_deform_vertsEM(ModifierData *md,
- const struct ModifierEvalContext *ctx,
- struct BMEditMesh *em,
- struct Mesh *me,
- float (*vertexCos)[3],
- int numVerts);
+ const struct ModifierEvalContext *ctx,
+ struct BMEditMesh *em,
+ struct Mesh *me,
+ float (*vertexCos)[3],
+ int numVerts);
struct Mesh *BKE_modifier_get_evaluated_mesh_from_evaluated_object(struct Object *ob_eval,
const bool get_cage_mesh);
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 62a457ec442..b3893d8600f 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -698,7 +698,8 @@ static float (*get_orco_coords(Object *ob, BMEditMesh *em, int layer, int *free)
/* apply shape key for cloth, this should really be solved
* by a more flexible customdata system, but not simple */
if (!em) {
- ClothModifierData *clmd = (ClothModifierData *)BKE_modifiers_findby_type(ob, eModifierType_Cloth);
+ ClothModifierData *clmd = (ClothModifierData *)BKE_modifiers_findby_type(
+ ob, eModifierType_Cloth);
KeyBlock *kb = BKE_keyblock_from_key(BKE_key_from_object(ob),
clmd->sim_parms->shapekey_rest);
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c
index 05acb9a22f3..c13f9d5ef00 100644
--- a/source/blender/blenkernel/intern/c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list