Commit: 3d7d930e31992364caf586d89d4256af1b479dbb
Author: Lukas Tönne
Date: Mon May 12 07:49:31 2014 +0200
https://developer.blender.org/rB3d7d930e31992364caf586d89d4256af1b479dbb
Fix for crash when doing "make local object+data" on an empty.
This commit added object data loop, without checking ob->data for NULL:
rB6e5e3b73f37f952420d87a3d8acd07a7f68dd5a3
===================================================================
M source/blender/editors/object/object_relations.c
===================================================================
diff --git a/source/blender/editors/object/object_relations.c
b/source/blender/editors/object/object_relations.c
index fc5f32b..6ff21f7 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -2117,7 +2117,7 @@ static void tag_localizable_objects(bContext *C, int mode)
/* If data is also gonna to become local, mark data we're
interested in
* as gonna-to-be-local.
*/
- if (mode == MAKE_LOCAL_SELECT_OBDATA) {
+ if (mode == MAKE_LOCAL_SELECT_OBDATA && object->data) {
ID *data_id = (ID *) object->data;
data_id->flag |= LIB_DOIT;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
