diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-04-24 15:11:05 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-04-24 15:11:05 +0300 |
| commit | 2010dbe8a59e80775219fb5162f3c2f5dfd24e04 (patch) | |
| tree | c816bd1504d011b3afac38922bc67e88b76a9505 /source/blender/blenkernel/intern/object_dupli.c | |
| parent | f93f4169cbfb2e3d5583d1bca5aa8466f37393dc (diff) | |
| parent | aff30aaf2dddeb30ae43ec45ff12073a73ffcdc0 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/object_dupli.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object_dupli.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c index 9a70c42418f..844edd87c37 100644 --- a/source/blender/blenkernel/intern/object_dupli.c +++ b/source/blender/blenkernel/intern/object_dupli.c @@ -186,8 +186,9 @@ static DupliObject *make_dupli(const DupliContext *ctx, dob->random_id = BLI_hash_string(dob->ob->id.name + 2); if (dob->persistent_id[0] != INT_MAX) { - for(i = 0; i < MAX_DUPLI_RECUR*2; i++) + for (i = 0; i < MAX_DUPLI_RECUR * 2; i++) { dob->random_id = BLI_hash_int_2d(dob->random_id, (unsigned int)dob->persistent_id[i]); + } } else { dob->random_id = BLI_hash_int_2d(dob->random_id, 0); |