diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-12-03 03:02:21 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-03 03:02:21 +0400 |
commit | d74c56423517de6db8ef1a1b3a74e0b1c8fc1dc6 (patch) | |
tree | 6769e6a395cfd780ba4da2559c7388f707145391 /source/blender/editors/object/object_relations.c | |
parent | 34c5698d2ef54e288090ec0e5c8feae639bfcd21 (diff) | |
parent | 06c3d5bd09e104d070d9e6c97e4baa265094240c (diff) |
svn merge ^/trunk/blender -r42333:42361
Diffstat (limited to 'source/blender/editors/object/object_relations.c')
-rw-r--r-- | source/blender/editors/object/object_relations.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index ab4ff20d503..437d2e880c1 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -338,7 +338,7 @@ static int make_proxy_exec (bContext *C, wmOperator *op) /* Add new object for the proxy */ newob= add_object(scene, OB_EMPTY); - BLI_snprintf(name, sizeof(name), "%s_proxy", ((ID *)(gob ? gob : ob))->name); + BLI_snprintf(name, sizeof(name), "%s_proxy", ((ID *)(gob ? gob : ob))->name+2); rename_id(&newob->id, name); |