Commit: 0c28aaae7e65538f8e6c30a35861dc6c49a84637
Author: Antony Riakiotakis
Date: Thu Nov 6 16:38:31 2014 +0100
Branches: master
https://developer.blender.org/rB0c28aaae7e65538f8e6c30a35861dc6c49a84637
Fix T42525 crash when deleting lamp attached to Lamp Data material node
in material shading mode.
===================================================================
M source/blender/blenkernel/intern/object.c
===================================================================
diff --git a/source/blender/blenkernel/intern/object.c
b/source/blender/blenkernel/intern/object.c
index 72f7d54..b910e11 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -435,6 +435,8 @@ void BKE_object_unlink(Object *ob)
Scene *sce;
SceneRenderLayer *srl;
FreestyleLineSet *lineset;
+ bNodeTree *ntree;
+ bNode *node;
Curve *cu;
Tex *tex;
Group *group;
@@ -811,6 +813,15 @@ void BKE_object_unlink(Object *ob)
}
camera = camera->id.next;
}
+
+ /* nodes */
+ for (ntree = bmain->nodetree.first; ntree; ntree = ntree->id.next) {
+ for (node = ntree->nodes.first; node; node = node->next) {
+ if (node->id == &ob->id) {
+ node->id = NULL;
+ }
+ }
+ }
}
/* actual check for internal data, not context or flags */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
