diff options
| author | Campbell Barton <campbell@blender.org> | 2022-08-19 06:46:37 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-08-19 06:46:37 +0300 |
| commit | 2a15040777a04170a00c3591065b8243e40428d5 (patch) | |
| tree | 88703ecd5d4d2684f265dc1c16e2a26e8497774a /source/blender/editors | |
| parent | 97f9015ed0b1a6a3e6247d5958dd50bbcd21d5ca (diff) | |
| parent | 529f0427fce2245d60eb885518f055209405b016 (diff) | |
Merge branch 'blender-v3.3-release'
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface_ops.cc | 4 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface_ops.cc b/source/blender/editors/interface/interface_ops.cc index 311d670b4ca..0657e17f1dc 100644 --- a/source/blender/editors/interface/interface_ops.cc +++ b/source/blender/editors/interface/interface_ops.cc @@ -830,8 +830,8 @@ static int override_idtemplate_create_exec(bContext *C, wmOperator *UNUSED(op)) * liboverride (note that in theory this remapping has already been done by code above), but * only in case owner ID was already an existing liboverride. * - * Otherwise, owner ID will also have been overridden, and remapped already to use itsoverride - * of the data too. */ + * Otherwise, owner ID will also have been overridden, and remapped already to use it's + * override of the data too. */ RNA_id_pointer_create(id_override, &idptr); RNA_property_pointer_set(&owner_ptr, prop, idptr, NULL); RNA_property_update(C, &owner_ptr, prop); diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index cd5a65270df..77837b96e86 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -887,8 +887,8 @@ static void template_id_liboverride_hierarchy_create(bContext *C, * created liboverride (note that in theory this remapping has already been done by code * above), but only in case owner ID was already an existing liboverride. * - * Otherwise, owner ID will also have been overridden, and remapped already to use itsoverride - * of the data too. */ + * Otherwise, owner ID will also have been overridden, and remapped already to use + * it's override of the data too. */ if (ID_IS_OVERRIDE_LIBRARY_REAL(owner_id)) { RNA_id_pointer_create(id_override, idptr); } |