[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60833] trunk/blender/source/blender/ blenkernel/intern/object.c: Missing ParticleSystem-> parent pointer check in BKE_object_unlink.

[Lukas Toenne]

Revision: 60833
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60833
Author:   lukastoenne
Date:     2013-10-17 19:31:59 +0000 (Thu, 17 Oct 2013)
Log Message:
-----------
Missing ParticleSystem->parent pointer check in BKE_object_unlink.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/object.c

Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c     2013-10-17 
18:49:09 UTC (rev 60832)
+++ trunk/blender/source/blender/blenkernel/intern/object.c     2013-10-17 
19:31:59 UTC (rev 60833)
@@ -590,6 +590,9 @@
                                                }
                                        }
                                }
+                               
+                               if (tpsys->parent == ob)
+                                       tpsys->parent = NULL;
                        }
                        if (ob->pd)
                                DAG_id_tag_update(&obt->id, OB_RECALC_DATA);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs