diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-04 16:46:51 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-04 16:46:51 +0400 |
| commit | 68d9e73ecd81186fe6934c48f6c26d89d788d343 (patch) | |
| tree | 59a1794b3432b4c62fd90cad51127baef117c268 /source/blender/editors/object/object_add.c | |
| parent | a0ce240de94521b6caf55b0738b70f2dc2ad3353 (diff) | |
Fix: forgot to commit these files as part of strand bugfix.
Diffstat (limited to 'source/blender/editors/object/object_add.c')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 52d14b9d374..85735c1ac1c 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -1102,7 +1102,7 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base, if (dupli_gh) BLI_ghash_insert(dupli_gh, dob, ob); if (parent_gh) - BLI_ghash_insert(parent_gh, BLI_ghashutil_pairalloc(dob->ob, dob->index), ob); + BLI_ghash_insert(parent_gh, BLI_ghashutil_pairalloc(dob->ob, SET_INT_IN_POINTER(dob->index)), ob); } if (use_hierarchy) { @@ -1116,7 +1116,7 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base, /* find parent that was also made real */ if (ob_src_par) { - GHashPair *pair = BLI_ghashutil_pairalloc(ob_src_par, dob->index); + GHashPair *pair = BLI_ghashutil_pairalloc(ob_src_par, SET_INT_IN_POINTER(dob->index)); ob_dst_par = BLI_ghash_lookup(parent_gh, pair); BLI_ghashutil_pairfree(pair); } |