diff options
| author | Campbell Barton <campbell@blender.org> | 2022-06-07 06:37:05 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-06-07 07:40:51 +0300 |
| commit | af6a68217ffd4e77237e43f150fe07cb33ebc7e8 (patch) | |
| tree | 739e3a3be8d29e648e383138d150c289084a0c63 | |
| parent | ea182deeb9cdd2a9137e98eb0072f57c0fb1e09f (diff) | |
Cleanup: format
| -rw-r--r-- | release/scripts/startup/nodeitems_builtins.py | 2 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 20 |
2 files changed, 12 insertions, 10 deletions
diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py index 55139bbb3d0..fec3447ca6c 100644 --- a/release/scripts/startup/nodeitems_builtins.py +++ b/release/scripts/startup/nodeitems_builtins.py @@ -182,6 +182,7 @@ def geometry_input_node_items(context): yield NodeItem("GeometryNodeInputRadius") yield NodeItem("GeometryNodeInputSceneTime") + # Custom Menu for Geometry Node Instance Nodes. def geometry_instance_node_items(context): if context is None: @@ -199,6 +200,7 @@ def geometry_instance_node_items(context): yield NodeItem("GeometryNodeInputInstanceRotation") yield NodeItem("GeometryNodeInputInstanceScale") + # Custom Menu for Material Nodes. def geometry_material_node_items(context): if context is None: diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index d9209b65276..87f6198ce0b 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -3590,18 +3590,18 @@ static void sculpt_combine_proxies(Sculpt *sd, Object *ob) return; } - /* First line is tools that don't support proxies. */ - const bool use_orco = ELEM(brush->sculpt_tool, - SCULPT_TOOL_GRAB, - SCULPT_TOOL_ROTATE, - SCULPT_TOOL_THUMB, - SCULPT_TOOL_ELASTIC_DEFORM, - SCULPT_TOOL_BOUNDARY, - SCULPT_TOOL_POSE); + /* First line is tools that don't support proxies. */ + const bool use_orco = ELEM(brush->sculpt_tool, + SCULPT_TOOL_GRAB, + SCULPT_TOOL_ROTATE, + SCULPT_TOOL_THUMB, + SCULPT_TOOL_ELASTIC_DEFORM, + SCULPT_TOOL_BOUNDARY, + SCULPT_TOOL_POSE); - BKE_pbvh_gather_proxies(ss->pbvh, &nodes, &totnode); + BKE_pbvh_gather_proxies(ss->pbvh, &nodes, &totnode); - SculptThreadedTaskData data = { + SculptThreadedTaskData data = { .sd = sd, .ob = ob, .brush = brush, |