me-main #1

Merged
Nate Rupsis merged 123 commits from me-main into main 2023-02-13 18:39:11 +01:00
6 changed files with 13 additions and 13 deletions
Showing only changes of commit 675717eb79 - Show all commits

View File

@ -4064,7 +4064,7 @@ void GPENCIL_OT_reproject(wmOperatorType *ot)
"keep_original", "keep_original",
0, 0,
"Keep Original", "Keep Original",
"Keep original strokes and create a copy before reprojecting instead of reproject them"); "Keep original strokes and create a copy before reprojecting");
RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_MOVIECLIP); RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_MOVIECLIP);
RNA_def_float(ot->srna, "offset", 0.0f, 0.0f, 10.0f, "Surface Offset", "", 0.0f, 10.0f); RNA_def_float(ot->srna, "offset", 0.0f, 0.0f, 10.0f, "Surface Offset", "", 0.0f, 10.0f);
@ -4771,7 +4771,7 @@ void GPENCIL_OT_stroke_simplify(wmOperatorType *ot)
/* identifiers */ /* identifiers */
ot->name = "Simplify Stroke"; ot->name = "Simplify Stroke";
ot->idname = "GPENCIL_OT_stroke_simplify"; ot->idname = "GPENCIL_OT_stroke_simplify";
ot->description = "Simplify selected stroked reducing number of points"; ot->description = "Simplify selected strokes, reducing number of points";
/* api callbacks */ /* api callbacks */
ot->exec = gpencil_stroke_simplify_exec; ot->exec = gpencil_stroke_simplify_exec;
@ -4832,7 +4832,7 @@ void GPENCIL_OT_stroke_simplify_fixed(wmOperatorType *ot)
/* identifiers */ /* identifiers */
ot->name = "Simplify Fixed Stroke"; ot->name = "Simplify Fixed Stroke";
ot->idname = "GPENCIL_OT_stroke_simplify_fixed"; ot->idname = "GPENCIL_OT_stroke_simplify_fixed";
ot->description = "Simplify selected stroked reducing number of points using fixed algorithm"; ot->description = "Simplify selected strokes, reducing number of points using fixed algorithm";
/* api callbacks */ /* api callbacks */
ot->exec = gpencil_stroke_simplify_fixed_exec; ot->exec = gpencil_stroke_simplify_fixed_exec;

View File

@ -188,7 +188,7 @@ void GPENCIL_OT_stroke_editcurve_set_handle_type(wmOperatorType *ot)
/* identifiers */ /* identifiers */
ot->name = "Set handle type"; ot->name = "Set handle type";
ot->idname = "GPENCIL_OT_stroke_editcurve_set_handle_type"; ot->idname = "GPENCIL_OT_stroke_editcurve_set_handle_type";
ot->description = "Set the type of a edit curve handle"; ot->description = "Set the type of an edit curve handle";
/* api callbacks */ /* api callbacks */
ot->invoke = WM_menu_invoke; ot->invoke = WM_menu_invoke;

View File

@ -75,7 +75,7 @@ const EnumPropertyItem rna_enum_usd_mtl_name_collision_mode_items[] = {
const EnumPropertyItem rna_enum_usd_tex_import_mode_items[] = { const EnumPropertyItem rna_enum_usd_tex_import_mode_items[] = {
{USD_TEX_IMPORT_NONE, "IMPORT_NONE", 0, "None", "Don't import textures"}, {USD_TEX_IMPORT_NONE, "IMPORT_NONE", 0, "None", "Don't import textures"},
{USD_TEX_IMPORT_PACK, "IMPORT_PACK", 0, "Packed", "Import textures as packed data"}, {USD_TEX_IMPORT_PACK, "IMPORT_PACK", 0, "Packed", "Import textures as packed data"},
{USD_TEX_IMPORT_COPY, "IMPORT_COPY", 0, "Copy", "Copy files to Textures Directory"}, {USD_TEX_IMPORT_COPY, "IMPORT_COPY", 0, "Copy", "Copy files to textures directory"},
{0, NULL, 0, NULL, NULL}, {0, NULL, 0, NULL, NULL},
}; };
@ -675,7 +675,7 @@ void WM_OT_usd_import(struct wmOperatorType *ot)
"//textures/", "//textures/",
FILE_MAXDIR, FILE_MAXDIR,
"Textures Directory", "Textures Directory",
"Path to the directory where imported textures will be copied "); "Path to the directory where imported textures will be copied");
RNA_def_enum( RNA_def_enum(
ot->srna, ot->srna,

View File

@ -275,7 +275,7 @@ static void rna_def_curves_point(BlenderRNA *brna)
prop = RNA_def_property(srna, "index", PROP_INT, PROP_UNSIGNED); prop = RNA_def_property(srna, "index", PROP_INT, PROP_UNSIGNED);
RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_int_funcs(prop, "rna_CurvePoint_index_get", NULL, NULL); RNA_def_property_int_funcs(prop, "rna_CurvePoint_index_get", NULL, NULL);
RNA_def_property_ui_text(prop, "Index", "Index of this points"); RNA_def_property_ui_text(prop, "Index", "Index of this point");
} }
/* Defines a read-only vector type since normals can not be modified manually. */ /* Defines a read-only vector type since normals can not be modified manually. */

View File

@ -3313,12 +3313,12 @@ static void rna_def_modifier_correctivesmooth(BlenderRNA *brna)
"ORCO", "ORCO",
0, 0,
"Original Coords", "Original Coords",
"Use base mesh vertex coords as the rest position"}, "Use base mesh vertex coordinates as the rest position"},
{MOD_CORRECTIVESMOOTH_RESTSOURCE_BIND, {MOD_CORRECTIVESMOOTH_RESTSOURCE_BIND,
"BIND", "BIND",
0, 0,
"Bind Coords", "Bind Coords",
"Use bind vertex coords for rest position"}, "Use bind vertex coordinates for rest position"},
{0, NULL, 0, NULL, NULL}, {0, NULL, 0, NULL, NULL},
}; };
@ -5967,13 +5967,13 @@ static void rna_def_modifier_meshcache(BlenderRNA *brna)
"OVERWRITE", "OVERWRITE",
0, 0,
"Overwrite", "Overwrite",
"Replace vertex coords with cached values"}, "Replace vertex coordinates with cached values"},
{MOD_MESHCACHE_DEFORM_INTEGRATE, {MOD_MESHCACHE_DEFORM_INTEGRATE,
"INTEGRATE", "INTEGRATE",
0, 0,
"Integrate", "Integrate",
"Integrate deformation from this modifiers input with the mesh-cache coords (useful for " "Integrate deformation from this modifier's input with the mesh-cache coordinates "
"shape keys)"}, "(useful for shape keys)"},
{0, NULL, 0, NULL, NULL}, {0, NULL, 0, NULL, NULL},
}; };

View File

@ -162,7 +162,7 @@ static void rna_def_point(BlenderRNA *brna)
prop = RNA_def_property(srna, "index", PROP_INT, PROP_UNSIGNED); prop = RNA_def_property(srna, "index", PROP_INT, PROP_UNSIGNED);
RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_int_funcs(prop, "rna_Point_index_get", NULL, NULL); RNA_def_property_int_funcs(prop, "rna_Point_index_get", NULL, NULL);
RNA_def_property_ui_text(prop, "Index", "Index of this points"); RNA_def_property_ui_text(prop, "Index", "Index of this point");
} }
static void rna_def_pointcloud(BlenderRNA *brna) static void rna_def_pointcloud(BlenderRNA *brna)