diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-05-07 22:44:17 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-05-28 19:40:09 +0300 |
| commit | 001ba5bdf5975906f294cc7bde258409be7444b0 (patch) | |
| tree | a9cc465834bd66e25dc0b51b7a6da01ff17ef001 /intern/cycles/render/object.h | |
| parent | c96a4c8a2aeab761983b2b9c76104639c5721a2f (diff) | |
Code refactor: nodify object and mesh, but not used for XML yet.
Differential Revision: https://developer.blender.org/D2016
Diffstat (limited to 'intern/cycles/render/object.h')
| -rw-r--r-- | intern/cycles/render/object.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/render/object.h b/intern/cycles/render/object.h index c2a79ca8dc4..57614c95580 100644 --- a/intern/cycles/render/object.h +++ b/intern/cycles/render/object.h @@ -17,6 +17,7 @@ #ifndef __OBJECT_H__ #define __OBJECT_H__ +#include "node.h" #include "scene.h" #include "util_boundbox.h" @@ -37,12 +38,13 @@ struct Transform; /* Object */ -class Object { +class Object : public Node { public: + NODE_DECLARE; + Mesh *mesh; Transform tfm; BoundBox bounds; - ustring name; uint random_id; int pass_id; vector<ParamValue> attributes; |