diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-08-13 12:50:07 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-08-13 12:50:07 +0300 |
| commit | 46aa30240005bfbb527e1f3e2a9279eb61e19a54 (patch) | |
| tree | 1cf399b7b6d2c7ce57cc35b1a58656de43cfb93d /source/blender/blenkernel/intern/object_dupli.c | |
| parent | 7c380119a7089ed98a280bc3d2202c0345a0d1c7 (diff) | |
| parent | ada98869dfa16272cd7db1c01d33a7002dc38195 (diff) | |
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'source/blender/blenkernel/intern/object_dupli.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object_dupli.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c index 108a952dc69..d69f4a39263 100644 --- a/source/blender/blenkernel/intern/object_dupli.c +++ b/source/blender/blenkernel/intern/object_dupli.c @@ -897,8 +897,8 @@ static DupliObject *face_dupli(const DupliContext *ctx, /* Make offset relative to inst_ob using relative child transform. */ mul_mat3_m4_v3(child_imat, obmat[3]); - /* XXX ugly hack to ensure same behavior as in master this should not be needed, - * #Object.parentinv is not consistent outside of parenting. */ + /* XXX ugly hack to ensure same behavior as in master. + * This should not be needed, #Object.parentinv is not consistent outside of parenting. */ { float imat[3][3]; copy_m3_m4(imat, inst_ob->parentinv); |