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:
authorCampbell Barton <ideasman42@gmail.com>2010-12-07 03:48:36 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-12-07 03:48:36 +0300
commit4425331729fe2fc5fbca28c706df8e081f4577ee (patch)
tree019014a7b08aa667fb885ab8624e2b034422bdc2 /source/blender/editors/object/object_add.c
parent8e8b07cc07048f4445e6ff4f07fa12d0c89d4ff0 (diff)
fix for crash on missing NULL check,
Brecht, changed this to update the duplicate objects data rather then the old ones incase they are not linked.
Diffstat (limited to 'source/blender/editors/object/object_add.c')
-rw-r--r--source/blender/editors/object/object_add.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 58985a97a72..5a4bbaf480c 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -1658,8 +1658,10 @@ static int duplicate_exec(bContext *C, wmOperator *op)
/* new object becomes active */
if(BASACT==base)
ED_base_object_activate(C, basen);
-
- DAG_id_tag_update(base->object->data, 0);
+
+ if(basen->object->data) {
+ DAG_id_tag_update(basen->object->data, 0);
+ }
}
CTX_DATA_END;