1 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index e43c0999698..7bf0eadf088 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -114,6 +114,8 @@
 
 #include "GPU_material.h"
 
+#include "FRS_freestyle.h"
+
 /* Local function protos */
 static void solve_parenting(Scene *scene, Object *ob, Object *par, float obmat[][4], float slowmat[][4], int simul);
 
@@ -614,6 +616,14 @@ void BKE_object_unlink(Object *ob)
 				}
 				SEQ_END
 			}
+
+			{
+				SceneRenderLayer *srl;
+
+				for (srl= sce->r.layers.first; srl; srl= srl->next) {
+					FRS_unlink_target_object(&srl->freestyleConfig, ob);
+				}
+			}
 		}
 
 		sce = sce->id.next;