Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r--source/blender/makesrna/intern/rna_scene.c26
-rw-r--r--source/blender/makesrna/intern/rna_space.c27
2 files changed, 26 insertions, 27 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index c8f65e5e153..178029ef340 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -2883,6 +2883,25 @@ static void rna_def_tool_settings(BlenderRNA *brna)
{0, NULL, 0, NULL, NULL},
};
+ static const EnumPropertyItem uv_sticky_mode_items[] = {
+ {SI_STICKY_DISABLE,
+ "DISABLED",
+ ICON_STICKY_UVS_DISABLE,
+ "Disabled",
+ "Sticky vertex selection disabled"},
+ {SI_STICKY_LOC,
+ "SHARED_LOCATION",
+ ICON_STICKY_UVS_LOC,
+ "Shared Location",
+ "Select UVs that are at the same location and share a mesh vertex"},
+ {SI_STICKY_VERTEX,
+ "SHARED_VERTEX",
+ ICON_STICKY_UVS_VERT,
+ "Shared Vertex",
+ "Select UVs that share a mesh vertex, whether or not they are at the same location"},
+ {0, NULL, 0, NULL, NULL},
+ };
+
srna = RNA_def_struct(brna, "ToolSettings", NULL);
RNA_def_struct_path_func(srna, "rna_ToolSettings_path");
RNA_def_struct_ui_text(srna, "Tool Settings", "");
@@ -3454,6 +3473,13 @@ static void rna_def_tool_settings(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "UV Selection Mode", "UV selection and display mode");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_IMAGE, NULL);
+ prop = RNA_def_property(srna, "uv_sticky_select_mode", PROP_ENUM, PROP_NONE);
+ RNA_def_property_enum_sdna(prop, NULL, "uv_sticky");
+ RNA_def_property_enum_items(prop, uv_sticky_mode_items);
+ RNA_def_property_ui_text(
+ prop, "Sticky Selection Mode", "Method for extending UV vertex selection");
+ RNA_def_property_update(prop, NC_SPACE | ND_SPACE_IMAGE, NULL);
+
prop = RNA_def_property(srna, "use_uv_select_sync", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "uv_flag", UV_SYNC_SELECTION);
RNA_def_property_ui_text(
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 20fa8b87cd2..c51f0c00498 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -3428,25 +3428,6 @@ static void rna_def_space_image_uv(BlenderRNA *brna)
StructRNA *srna;
PropertyRNA *prop;
- static const EnumPropertyItem sticky_mode_items[] = {
- {SI_STICKY_DISABLE,
- "DISABLED",
- ICON_STICKY_UVS_DISABLE,
- "Disabled",
- "Sticky vertex selection disabled"},
- {SI_STICKY_LOC,
- "SHARED_LOCATION",
- ICON_STICKY_UVS_LOC,
- "Shared Location",
- "Select UVs that are at the same location and share a mesh vertex"},
- {SI_STICKY_VERTEX,
- "SHARED_VERTEX",
- ICON_STICKY_UVS_VERT,
- "Shared Vertex",
- "Select UVs that share a mesh vertex, whether or not they are at the same location"},
- {0, NULL, 0, NULL, NULL},
- };
-
static const EnumPropertyItem dt_uvstretch_items[] = {
{SI_UVDT_STRETCH_ANGLE, "ANGLE", 0, "Angle", "Angular distortion between UV and 3D angles"},
{SI_UVDT_STRETCH_AREA, "AREA", 0, "Area", "Area distortion between UV and 3D faces"},
@@ -3466,14 +3447,6 @@ static void rna_def_space_image_uv(BlenderRNA *brna)
RNA_def_struct_path_func(srna, "rna_SpaceUVEditor_path");
RNA_def_struct_ui_text(srna, "Space UV Editor", "UV editor data for the image editor space");
- /* selection */
- prop = RNA_def_property(srna, "sticky_select_mode", PROP_ENUM, PROP_NONE);
- RNA_def_property_enum_sdna(prop, NULL, "sticky");
- RNA_def_property_enum_items(prop, sticky_mode_items);
- RNA_def_property_ui_text(
- prop, "Sticky Selection Mode", "Method for extending UV vertex selection");
- RNA_def_property_update(prop, NC_SPACE | ND_SPACE_IMAGE, NULL);
-
/* drawing */
prop = RNA_def_property(srna, "edge_display_type", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "dt_uv");