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
path: root/source
diff options
context:
space:
mode:
authorJoseph Eagar <joeedh@gmail.com>2010-04-13 20:52:18 +0400
committerJoseph Eagar <joeedh@gmail.com>2010-04-13 20:52:18 +0400
commitfe3a9a2f30281309d711417d5fa0e784a23ef38b (patch)
tree174e31fbb5719ad7599a38e73821e686583e4128 /source
parent86aa4e5c3d7e0b95d9e55bab027f968b42a3eda6 (diff)
fixed make local bug; it was only looking at editable objects, which of course lib objects are not.
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/object/object_relations.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index 52d6a7a7b8b..a6a955e6df8 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -1710,21 +1710,21 @@ static int make_local_exec(bContext *C, wmOperator *op)
clear_id_newpoins();
- CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
+ CTX_DATA_BEGIN(C, Object*, ob, selected_objects) {
if(ob->id.lib)
id_make_local(&ob->id, 0);
}
CTX_DATA_END;
/* maybe object pointers */
- CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
+ CTX_DATA_BEGIN(C, Object*, ob, selected_objects) {
if(ob->id.lib==NULL) {
ID_NEW(ob->parent);
}
}
CTX_DATA_END;
- CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
+ CTX_DATA_BEGIN(C, Object*, ob, selected_objects) {
id= ob->data;
if(id && mode>1) {
@@ -1742,7 +1742,7 @@ static int make_local_exec(bContext *C, wmOperator *op)
CTX_DATA_END;
if(mode>1) {
- CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
+ CTX_DATA_BEGIN(C, Object*, ob, selected_objects) {
if(ob->type==OB_LAMP) {
la= ob->data;