|
@@ -107,6 +107,7 @@ namespace Blender {
|
|
|
struct Object;
|
|
|
struct MTex;
|
|
|
struct Image;
|
|
|
+struct Collection;
|
|
|
|
|
|
#include <memory>
|
|
|
|
|
@@ -147,18 +148,11 @@ struct Group : ElemBase {
|
|
|
std::shared_ptr<GroupObject> gobject;
|
|
|
};
|
|
|
|
|
|
-// -------------------------------------------------------------------------------
|
|
|
-struct Collection : ElemBase {
|
|
|
- ID id FAIL;
|
|
|
- ListBase gobject; // CollectionObject
|
|
|
- ListBase children; // CollectionChild
|
|
|
- //ListBase objects; // Objects
|
|
|
-};
|
|
|
-
|
|
|
// -------------------------------------------------------------------------------
|
|
|
struct CollectionObject : ElemBase {
|
|
|
- std::shared_ptr<CollectionObject> next, prev;
|
|
|
- std::shared_ptr<Object> ob;
|
|
|
+ //CollectionObject* prev;
|
|
|
+ std::shared_ptr<CollectionObject> next;
|
|
|
+ Object *ob;
|
|
|
};
|
|
|
|
|
|
// -------------------------------------------------------------------------------
|
|
@@ -167,6 +161,13 @@ struct CollectionChild : ElemBase {
|
|
|
std::shared_ptr<Collection> collection;
|
|
|
};
|
|
|
|
|
|
+// -------------------------------------------------------------------------------
|
|
|
+struct Collection : ElemBase {
|
|
|
+ ID id FAIL;
|
|
|
+ ListBase gobject; // CollectionObject
|
|
|
+ ListBase children; // CollectionChild
|
|
|
+};
|
|
|
+
|
|
|
// -------------------------------------------------------------------------------
|
|
|
struct World : ElemBase {
|
|
|
ID id FAIL;
|