[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23955] trunk/blender/source/blender/ blenkernel/intern: Fix #19588: duplicating objects with particle systems would crash.

[Brecht Van Lommel]

Revision: 23955
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23955
Author:   blendix
Date:     2009-10-19 15:17:47 +0200 (Mon, 19 Oct 2009)

Log Message:
-----------
Fix #19588: duplicating objects with particle systems would crash.
Also an unrelated warning fix.

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

Modified: trunk/blender/source/blender/blenkernel/intern/key.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/key.c	2009-10-19 13:09:24 UTC (rev 23954)
+++ trunk/blender/source/blender/blenkernel/intern/key.c	2009-10-19 13:17:47 UTC (rev 23955)
@@ -1505,7 +1505,7 @@
 		return NULL;
 	
 	/* create the RNA pointer */
-	RNA_pointer_create(key, &RNA_ShapeKey, kb, &ptr);
+	RNA_pointer_create(&key->id, &RNA_ShapeKey, kb, &ptr);
 	/* get pointer to the property too */
 	prop= RNA_struct_find_property(&ptr, "value");
 	

Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c	2009-10-19 13:09:24 UTC (rev 23954)
+++ trunk/blender/source/blender/blenkernel/intern/object.c	2009-10-19 13:17:47 UTC (rev 23955)
@@ -1133,6 +1133,7 @@
 	psysn->pathcache= NULL;
 	psysn->childcache= NULL;
 	psysn->edit= NULL;
+	psysn->pdd= NULL;
 	
 	psysn->pathcachebufs.first = psysn->pathcachebufs.last = NULL;
 	psysn->childcachebufs.first = psysn->childcachebufs.last = NULL;