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 /release/scripts | |
parent | c3001812dc0253624c03236e75da229418a8c4ad (diff) | |
parent | c7c8ee61686f22a11995f6fe6b10acf59db12b00 (diff) |
Merge remote-tracking branch 'origin/blender-v2.82-release'
Diffstat (limited to 'release/scripts')
-rw-r--r-- | release/scripts/modules/rna_manual_reference.py | 1 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_curve.py | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/release/scripts/modules/rna_manual_reference.py b/release/scripts/modules/rna_manual_reference.py index 1f01523534f..2e78f18b78e 100644 --- a/release/scripts/modules/rna_manual_reference.py +++ b/release/scripts/modules/rna_manual_reference.py @@ -197,7 +197,6 @@ url_manual_mapping = ( ("bpy.types.compositornodedilateerode*", "compositing/types/filter/dilate_erode.html#bpy-types-compositornodedilateerode"), ("bpy.types.compositornodeellipsemask*", "compositing/types/matte/ellipse_mask.html#bpy-types-compositornodeellipsemask"), ("bpy.types.compositornodesplitviewer*", "compositing/types/output/split_viewer.html#bpy-types-compositornodesplitviewer"), - ("bpy.types.curve.use_uv_as_generated*", "editors/uv/generated_uvs.html#bpy-types-curve-use-uv-as-generated"), ("bpy.types.dynamicpaintbrushsettings*", "physics/dynamic_paint/brush.html#bpy-types-dynamicpaintbrushsettings"), ("bpy.types.materialgpencilstyle.flip*", "grease_pencil/materials/grease_pencil_shader.html#bpy-types-materialgpencilstyle-flip"), ("bpy.types.materialgpencilstyle.mode*", "grease_pencil/materials/grease_pencil_shader.html#bpy-types-materialgpencilstyle-mode"), diff --git a/release/scripts/startup/bl_ui/properties_data_curve.py b/release/scripts/startup/bl_ui/properties_data_curve.py index d1975919d7e..b694062dfc5 100644 --- a/release/scripts/startup/bl_ui/properties_data_curve.py +++ b/release/scripts/startup/bl_ui/properties_data_curve.py @@ -144,7 +144,6 @@ class DATA_PT_curve_texture_space(CurveButtonsPanel, Panel): curve = context.curve col = layout.column() - col.prop(curve, "use_uv_as_generated") col.prop(curve, "use_auto_texspace") col = layout.column() |