From 001ba5bdf5975906f294cc7bde258409be7444b0 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@gmail.com>
Date: Sat, 7 May 2016 21:44:17 +0200
Subject: Code refactor: nodify object and mesh, but not used for XML yet.

Differential Revision: https://developer.blender.org/D2016
---
 intern/cycles/render/object.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'intern/cycles/render/object.h')

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;
-- 
cgit v1.2.3