diff options
author | Ray Molenkamp <github@lazydodo.com> | 2020-01-30 01:02:02 +0300 |
---|---|---|
committer | Ray Molenkamp <github@lazydodo.com> | 2020-01-30 01:02:02 +0300 |
commit | 89996da1f5b28b586bfbd7c54b568c5034a5fe91 (patch) | |
tree | 029ca7493a99abbecf406718e433ac529d7694f4 /source/blender/makesrna | |
parent | c3001812dc0253624c03236e75da229418a8c4ad (diff) | |
parent | c7c8ee61686f22a11995f6fe6b10acf59db12b00 (diff) |
Merge remote-tracking branch 'origin/blender-v2.82-release'
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_curve.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index d7deccef355..e900160a653 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -1033,16 +1033,9 @@ static void rna_def_path(BlenderRNA *UNUSED(brna), StructRNA *srna) RNA_def_property_update(prop, 0, "rna_Curve_update_data"); } -static void rna_def_nurbs(BlenderRNA *UNUSED(brna), StructRNA *srna) +static void rna_def_nurbs(BlenderRNA *UNUSED(brna), StructRNA *UNUSED(srna)) { - PropertyRNA *prop; - - /* flags */ - prop = RNA_def_property(srna, "use_uv_as_generated", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_UV_ORCO); - RNA_def_property_ui_text( - prop, "Use UV for Mapping", "Uses the UV values as Generated textured coordinates"); - RNA_def_property_update(prop, 0, "rna_Curve_update_data"); + /* Nothing. */ } static void rna_def_font(BlenderRNA *UNUSED(brna), StructRNA *srna) @@ -1757,12 +1750,6 @@ static void rna_def_curve(BlenderRNA *brna) prop, "rna_Curve_texspace_size_get", "rna_Curve_texspace_size_set", NULL); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); - prop = RNA_def_property(srna, "use_uv_as_generated", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_UV_ORCO); - RNA_def_property_ui_text( - prop, "Use UV for mapping", "Uses the UV values as Generated textured coordinates"); - RNA_def_property_update(prop, 0, "rna_Curve_update_data"); - /* materials */ prop = RNA_def_property(srna, "materials", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "mat", "totcol"); |