diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-01-23 13:20:42 +0400 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2014-01-23 13:20:42 +0400 |
| commit | 6c1c6f22cea9729c40e02ed45374bad31fbca6dd (patch) | |
| tree | c6433821f7ac73cd3f757d2de09afc1db00360ab /source/blender/makesdna/DNA_object_types.h | |
| parent | 1713db203583a1b93143b14dfa77eb447697deac (diff) | |
Removed the omat matrix from DupliObject.
This was storing the original object matrix, which builds on the
assumption that obmat is modified during dupli construction, which is a
bad hack.
Now the obmats are still modified, but this only happens outside of the
dupli system itself and the original ("omat") is stored as local
variables in the same place where the obmat manipulation takes place.
This is easier to follow and avoids hidden hacks as much as possible.
Reviewed By: campbellbarton
Differential Revision: https://developer.blender.org/D254
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 782d00fd2c9..1f18b054d0e 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -317,7 +317,7 @@ typedef struct DupliObject { struct DupliObject *next, *prev; struct Object *ob; unsigned int origlay, pad; - float mat[4][4], omat[4][4]; + float mat[4][4]; float orco[3], uv[2]; short type; /* from Object.transflag */ |