diff options
author | Joseph Eagar <joeedh@gmail.com> | 2022-09-29 09:41:53 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2022-10-03 15:59:17 +0300 |
commit | 78349c2578c10a5de10011fbbe07ecb62025eaa7 (patch) | |
tree | 0c1d6e7723ba0e8db60c55b579dca93b1aa30480 | |
parent | 5d1a0167e1f48a1918572bbd53d59296341f491d (diff) |
Cleanup: run clang-format in sculpt code
-rw-r--r-- | source/blender/editors/include/ED_sculpt.h | 5 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_intern.h | 4 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_ops.c | 3 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_transform.c | 5 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_brush.c | 26 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_sculpt_paint.c | 65 |
6 files changed, 52 insertions, 56 deletions
diff --git a/source/blender/editors/include/ED_sculpt.h b/source/blender/editors/include/ED_sculpt.h index 59b2d8d31b9..1c1ce41ef7a 100644 --- a/source/blender/editors/include/ED_sculpt.h +++ b/source/blender/editors/include/ED_sculpt.h @@ -34,7 +34,10 @@ bool ED_sculpt_mask_box_select(struct bContext *C, /* sculpt_transform.c */ void ED_sculpt_update_modal_transform(struct bContext *C, struct Object *ob); -void ED_sculpt_init_transform(struct bContext *C, struct Object *ob, const int mval[2], const char *undo_name); +void ED_sculpt_init_transform(struct bContext *C, + struct Object *ob, + const int mval[2], + const char *undo_name); void ED_sculpt_end_transform(struct bContext *C, struct Object *ob); /* sculpt_undo.c */ diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h index f4701ee216d..d639ff82545 100644 --- a/source/blender/editors/sculpt_paint/sculpt_intern.h +++ b/source/blender/editors/sculpt_paint/sculpt_intern.h @@ -1300,8 +1300,8 @@ typedef struct AutomaskingNodeData { } AutomaskingNodeData; /** Call before PBVH vertex iteration. - * \param automask_data: pointer to an uninitialized AutomaskingNodeData struct. - */ + * \param automask_data: pointer to an uninitialized AutomaskingNodeData struct. + */ void SCULPT_automasking_node_begin(struct Object *ob, const SculptSession *ss, struct AutomaskingCache *automasking, diff --git a/source/blender/editors/sculpt_paint/sculpt_ops.c b/source/blender/editors/sculpt_paint/sculpt_ops.c index 64a55168977..7ad905e5788 100644 --- a/source/blender/editors/sculpt_paint/sculpt_ops.c +++ b/source/blender/editors/sculpt_paint/sculpt_ops.c @@ -1034,8 +1034,7 @@ static void sculpt_bake_cavity_exec_task_cb(void *__restrict userdata, SCULPT_undo_push_node(tdata->ob, node, SCULPT_UNDO_MASK); AutomaskingNodeData automask_data; - SCULPT_automasking_node_begin( - tdata->ob, ss, ss->cache->automasking, &automask_data, node); + SCULPT_automasking_node_begin(tdata->ob, ss, ss->cache->automasking, &automask_data, node); BKE_pbvh_vertex_iter_begin (ss->pbvh, node, vd, PBVH_ITER_UNIQUE) { SCULPT_automasking_node_update(ss, &automask_data, &vd); diff --git a/source/blender/editors/sculpt_paint/sculpt_transform.c b/source/blender/editors/sculpt_paint/sculpt_transform.c index f841cd14386..d7bb692f85a 100644 --- a/source/blender/editors/sculpt_paint/sculpt_transform.c +++ b/source/blender/editors/sculpt_paint/sculpt_transform.c @@ -46,7 +46,10 @@ #include <math.h> #include <stdlib.h> -void ED_sculpt_init_transform(struct bContext *C, Object *ob, const int mval[2], const char *undo_name) +void ED_sculpt_init_transform(struct bContext *C, + Object *ob, + const int mval[2], + const char *undo_name) { Sculpt *sd = CTX_data_tool_settings(C)->sculpt; SculptSession *ss = ob->sculpt; diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index f927a3dab89..510fa8a6126 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -3271,27 +3271,27 @@ static void rna_def_brush(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Brush_update"); prop = RNA_def_property(srna, "use_automasking_start_normal", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna( - prop, NULL, "automasking_flags", BRUSH_AUTOMASKING_BRUSH_NORMAL); - RNA_def_property_ui_text(prop, - "Area Normal", - "Affect only vertices with a similar normal to where the stroke starts"); + RNA_def_property_boolean_sdna(prop, NULL, "automasking_flags", BRUSH_AUTOMASKING_BRUSH_NORMAL); + RNA_def_property_ui_text( + prop, + "Area Normal", + "Affect only vertices with a similar normal to where the stroke starts"); RNA_def_property_update(prop, 0, "rna_Brush_update"); prop = RNA_def_property(srna, "use_automasking_view_normal", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna( - prop, NULL, "automasking_flags", BRUSH_AUTOMASKING_VIEW_NORMAL); - RNA_def_property_ui_text(prop, - "View Normal", - "Affect only vertices with a normal that faces the viewer"); + RNA_def_property_boolean_sdna(prop, NULL, "automasking_flags", BRUSH_AUTOMASKING_VIEW_NORMAL); + RNA_def_property_ui_text( + prop, "View Normal", "Affect only vertices with a normal that faces the viewer"); RNA_def_property_update(prop, 0, "rna_Brush_update"); - + prop = RNA_def_property(srna, "use_automasking_view_occlusion", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "automasking_flags", BRUSH_AUTOMASKING_VIEW_OCCLUSION); - RNA_def_property_ui_text(prop, "Occlusion", "Only affect vertices that are not occluded by other faces. (Slower performance)"); + RNA_def_property_ui_text( + prop, + "Occlusion", + "Only affect vertices that are not occluded by other faces. (Slower performance)"); RNA_def_property_update(prop, 0, "rna_Brush_update"); - prop = RNA_def_property(srna, "use_scene_spacing", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag"); RNA_def_property_enum_items(prop, brush_spacing_unit_items); diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c index 5348cf80d22..d8ad3d1f41e 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.c +++ b/source/blender/makesrna/intern/rna_sculpt_paint.c @@ -953,64 +953,55 @@ static void rna_def_sculpt(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Cavity Curve", "Curve used for the sensitivity"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); - + prop = RNA_def_property(srna, "use_automasking_start_normal", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna( - prop, NULL, "automasking_flags", BRUSH_AUTOMASKING_BRUSH_NORMAL); - RNA_def_property_ui_text(prop, - "Area Normal", - "Affect only vertices with a similar normal to where the stroke starts"); + RNA_def_property_boolean_sdna(prop, NULL, "automasking_flags", BRUSH_AUTOMASKING_BRUSH_NORMAL); + RNA_def_property_ui_text( + prop, + "Area Normal", + "Affect only vertices with a similar normal to where the stroke starts"); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); prop = RNA_def_property(srna, "use_automasking_view_normal", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna( - prop, NULL, "automasking_flags", BRUSH_AUTOMASKING_VIEW_NORMAL); - RNA_def_property_ui_text(prop, - "View Normal", - "Affect only vertices with a normal that faces the viewer"); + RNA_def_property_boolean_sdna(prop, NULL, "automasking_flags", BRUSH_AUTOMASKING_VIEW_NORMAL); + RNA_def_property_ui_text( + prop, "View Normal", "Affect only vertices with a normal that faces the viewer"); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); prop = RNA_def_property(srna, "use_automasking_view_occlusion", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "automasking_flags", BRUSH_AUTOMASKING_VIEW_OCCLUSION); - RNA_def_property_ui_text(prop, "Occlusion", "Only affect vertices that are not occluded by other faces. (Slower performance)"); + RNA_def_property_ui_text( + prop, + "Occlusion", + "Only affect vertices that are not occluded by other faces. (Slower performance)"); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); prop = RNA_def_property(srna, "automasking_start_normal_limit", PROP_FLOAT, PROP_ANGLE); - RNA_def_property_float_sdna( - prop, NULL, "automasking_start_normal_limit"); - RNA_def_property_range(prop, 0.0001f, M_PI); - RNA_def_property_ui_text(prop, - "Area Normal Limit", - "The range of angles that will be affected"); + RNA_def_property_float_sdna(prop, NULL, "automasking_start_normal_limit"); + RNA_def_property_range(prop, 0.0001f, M_PI); + RNA_def_property_ui_text(prop, "Area Normal Limit", "The range of angles that will be affected"); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); prop = RNA_def_property(srna, "automasking_start_normal_falloff", PROP_FLOAT, PROP_FACTOR); - RNA_def_property_float_sdna( - prop, NULL, "automasking_start_normal_falloff"); - RNA_def_property_range(prop, 0.0001f, 1.0f); - RNA_def_property_ui_text(prop, - "Area Normal Falloff", - "Extend the angular range with a falloff gradient"); + RNA_def_property_float_sdna(prop, NULL, "automasking_start_normal_falloff"); + RNA_def_property_range(prop, 0.0001f, 1.0f); + RNA_def_property_ui_text( + prop, "Area Normal Falloff", "Extend the angular range with a falloff gradient"); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); prop = RNA_def_property(srna, "automasking_view_normal_limit", PROP_FLOAT, PROP_ANGLE); - RNA_def_property_float_sdna( - prop, NULL, "automasking_view_normal_limit"); - RNA_def_property_range(prop, 0.0001f, M_PI); - RNA_def_property_ui_text(prop, - "View Normal Limit", - "The range of angles that will be affected"); + RNA_def_property_float_sdna(prop, NULL, "automasking_view_normal_limit"); + RNA_def_property_range(prop, 0.0001f, M_PI); + RNA_def_property_ui_text(prop, "View Normal Limit", "The range of angles that will be affected"); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); prop = RNA_def_property(srna, "automasking_view_normal_falloff", PROP_FLOAT, PROP_FACTOR); - RNA_def_property_float_sdna( - prop, NULL, "automasking_view_normal_falloff"); - RNA_def_property_range(prop, 0.0001f, 1.0f); - RNA_def_property_ui_text(prop, - "View Normal Falloff", - "Extend the angular range with a falloff gradient"); + RNA_def_property_float_sdna(prop, NULL, "automasking_view_normal_falloff"); + RNA_def_property_range(prop, 0.0001f, 1.0f); + RNA_def_property_ui_text( + prop, "View Normal Falloff", "Extend the angular range with a falloff gradient"); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); - + prop = RNA_def_property(srna, "symmetrize_direction", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, rna_enum_symmetrize_direction_items); RNA_def_property_ui_text(prop, "Direction", "Source and destination for symmetrize operator"); |