diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-02-18 18:50:29 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-02-18 18:50:29 +0300 |
| commit | ddf189892c596d939228cc531b775bfd6708bb2d (patch) | |
| tree | cb3b28527696ef5a6a3eec581a55e6141c2e686d /source/blender/editors/interface | |
| parent | 48b17da1d9fe4d559c5b0fa58029df05a45d3960 (diff) | |
Cleanup: Rename original curve object type enum
This commit renames enums related the "Curve" object type and ID type
to add `_LEGACY` to the end. The idea is to make our aspirations clearer
in the code and to avoid ambiguities between `CURVE` and `CURVES`.
Ref T95355
To summarize for the record, the plans are:
- In the short/medium term, replace the `Curve` object data type with
`Curves`
- In the longer term (no immediate plans), use a proper data block for
3D text and surfaces.
Differential Revision: https://developer.blender.org/D14114
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index e277aa2e629..630f83cf828 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -2271,7 +2271,7 @@ int UI_icon_from_idcode(const int idcode) return ICON_CAMERA_DATA; case ID_CF: return ICON_FILE; - case ID_CU: + case ID_CU_LEGACY: return ICON_CURVE_DATA; case ID_GD: return ICON_OUTLINER_DATA_GREASEPENCIL; diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 2b7ca1f8b71..f8fbc2d01a6 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -731,7 +731,7 @@ static const char *template_id_browse_tip(const StructRNA *type) return N_("Browse Object to be linked"); case ID_ME: return N_("Browse Mesh Data to be linked"); - case ID_CU: + case ID_CU_LEGACY: return N_("Browse Curve Data to be linked"); case ID_MB: return N_("Browse Metaball Data to be linked"); @@ -844,7 +844,7 @@ static uiBut *template_id_def_new_but(uiBlock *block, BLT_I18NCONTEXT_ID_SCENE, BLT_I18NCONTEXT_ID_OBJECT, BLT_I18NCONTEXT_ID_MESH, - BLT_I18NCONTEXT_ID_CURVE, + BLT_I18NCONTEXT_ID_CURVE_LEGACY, BLT_I18NCONTEXT_ID_METABALL, BLT_I18NCONTEXT_ID_MATERIAL, BLT_I18NCONTEXT_ID_TEXTURE, |