aryeramaty/blender
0
0
Fork 1
forked from blender/blender
Code Pull Requests Activity

realize-depth #5

Merged
Arye Ramaty merged 43 commits from David-Haver/blender:realize-depth into WIP-realize-depth 2024-03-31 17:22:49 +02:00
Conversation 0 Commits 43 Files Changed 70 +13 -9
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f66cb1e635 - Show all commits

6
scripts/startup/bl_ui/space_view3d.py
View File

@ -7534,14 +7534,14 @@ class VIEW3D_PT_snapping(Panel):
layout = self.layout layout = self.layout
col = layout.column() col = layout.column()
col.label(text="Snap With") col.label(text="Snap Base")
row = col.row(align=True) row = col.row(align=True)
row.prop(tool_settings, "snap_target", expand=True) row.prop(tool_settings, "snap_target", expand=True)
col.label(text="Snap To") col.label(text="Snap Target")
col.prop(tool_settings, "snap_elements_base", expand=True) col.prop(tool_settings, "snap_elements_base", expand=True)
col.label(text="Snap Individual Elements To") col.label(text="Snap Target for Individual Elements")
col.prop(tool_settings, "snap_elements_individual", expand=True) col.prop(tool_settings, "snap_elements_individual", expand=True)
col.separator() col.separator()

14
source/blender/editors/transform/transform_ops.cc
View File

@ -705,11 +705,15 @@ void Transform_Properties(wmOperatorType *ot, int flags)
RNA_def_boolean(ot->srna, "use_snap_project", false, "Project Individual Elements", ""); RNA_def_boolean(ot->srna, "use_snap_project", false, "Project Individual Elements", "");
/* TODO(@gfxcoder): Rename `snap_target` to `snap_source` to avoid previous ambiguity of /* TODO(@gfxcoder): Rename `snap_target` to `snap_base` to avoid previous ambiguity of
* "target" (now, "source" is geometry to be moved and "target" is geometry to which moved * "target" (now, "base" or "source" is geometry to be moved and "target" is geometry to
* geometry is snapped). Use "Source snap point" and "Point on source that will snap to * which moved geometry is snapped). */
* target" for name and description, respectively. */ prop = RNA_def_enum(ot->srna,
prop = RNA_def_enum(ot->srna, "snap_target", rna_enum_snap_source_items, 0, "Snap With", ""); "snap_target",
rna_enum_snap_source_items,
0,
"Snap Base",
"Point on source that will snap to target");
RNA_def_property_flag(prop, PROP_HIDDEN); RNA_def_property_flag(prop, PROP_HIDDEN);
/* Target selection. */ /* Target selection. */

2
source/blender/makesrna/intern/rna_scene.cc
View File

@ -3574,7 +3574,7 @@ static void rna_def_tool_settings(BlenderRNA *brna)
prop, "rna_ToolSettings_snap_mode_get", "rna_ToolSettings_snap_mode_set", nullptr); prop, "rna_ToolSettings_snap_mode_get", "rna_ToolSettings_snap_mode_set", nullptr);
RNA_def_property_flag(prop, PROP_ENUM_FLAG); RNA_def_property_flag(prop, PROP_ENUM_FLAG);
RNA_def_property_ui_text( RNA_def_property_ui_text(
prop, "Snap Element", "Type of element for the \"Snap With\" to snap to"); prop, "Snap Element", "Type of element for the \"Snap Base\" to snap to");
RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, nullptr); /* header redraw */ RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, nullptr); /* header redraw */
prop = RNA_def_property(srna, "snap_elements_individual", PROP_ENUM, PROP_NONE); prop = RNA_def_property(srna, "snap_elements_individual", PROP_ENUM, PROP_NONE);