diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-04-18 17:06:01 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-04-18 17:29:42 +0300 |
| commit | bc6a75b405c4e0b1e85c9c6ec6646fd2d3f67686 (patch) | |
| tree | 1dd28ef80fa66fc0703ead335e2801fa10aa6ec4 /source/blender/makesdna/DNA_object_types.h | |
| parent | b8fd6f94a06c65f6bfe90d9cc45ae1406cd0dc27 (diff) | |
Revert "Object Info node support for GLSL mode and the internal render"
This reverts commit 76425feed8644a8fe1c0e52ef3f77b95012ba44e.
** Note **
This was supposed to be a merge, but it was rebased.
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 3045b5c3db5..71d05e41c43 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -342,8 +342,6 @@ typedef struct DupliObject { /* particle this dupli was generated from */ struct ParticleSystem *particle_system; - unsigned int random_id; - unsigned int pad; } DupliObject; /* **************** OBJECT ********************* */ |