diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-19 17:17:47 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-19 17:17:47 +0400 |
| commit | 2d0f3274bd8625a22d39f506bbc707084622244d (patch) | |
| tree | 99ce70085cb854c826be4ca51774d1a04986a9a7 /source | |
| parent | 60c50dda70cb8354660e92775033086d43a2ce3b (diff) | |
Fix #19588: duplicating objects with particle systems would crash.
Also an unrelated warning fix.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/key.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c index 3fffdef478b..0f0f63a668b 100644 --- a/source/blender/blenkernel/intern/key.c +++ b/source/blender/blenkernel/intern/key.c @@ -1505,7 +1505,7 @@ char *key_get_curValue_rnaPath(Key *key, KeyBlock *kb) 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"); diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index eb5beb734a1..5dcfa63e667 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1133,6 +1133,7 @@ ParticleSystem *copy_particlesystem(ParticleSystem *psys) 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; |