Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2019-02-01 12:44:41 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2019-02-01 12:58:12 +0300
commit7f0e773dcdeecf14daa005dddd9a7cfe6b932131 (patch)
treea2140bea07e4bd5ae26c1d52144d8518ba3e11c4 /source/blender
parent1b7c361fbb320744e6b7cc0c03b5f850e8fbfd9e (diff)
'make links': rename group -> collection in enum in UI
also rename dupli -> instance Fixes T61086 Reviewers: billreynish Maniphest Tasks: T61086 Differential Revision: https://developer.blender.org/D4294
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/editors/object/object_relations.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index 33d698757b8..8e354c5f4e7 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -1549,8 +1549,8 @@ void OBJECT_OT_make_links_data(wmOperatorType *ot)
{MAKE_LINKS_OBDATA, "OBDATA", 0, "Object Data", ""},
{MAKE_LINKS_MATERIALS, "MATERIAL", 0, "Materials", ""},
{MAKE_LINKS_ANIMDATA, "ANIMATION", 0, "Animation Data", ""},
- {MAKE_LINKS_GROUP, "GROUPS", 0, "Group", ""},
- {MAKE_LINKS_DUPLICOLLECTION, "DUPLICOLLECTION", 0, "DupliGroup", ""},
+ {MAKE_LINKS_GROUP, "GROUPS", 0, "Collection", ""},
+ {MAKE_LINKS_DUPLICOLLECTION, "DUPLICOLLECTION", 0, "Instance Collection", ""},
{MAKE_LINKS_MODIFIERS, "MODIFIERS", 0, "Modifiers", ""},
{MAKE_LINKS_FONTS, "FONTS", 0, "Fonts", ""},
{0, NULL, 0, NULL, NULL}};