archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: format

Browse Source
This commit is contained in:
Campbell Barton
2022-06-07 13:37:05 +10:00
parent ea182deeb9
commit af6a68217f
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/nodeitems_builtins.py
View File

@@ -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:

20
source/blender/editors/sculpt_paint/sculpt.c
View File

@@ -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,