Merge branch 'master' of https://github.com/AxioDL/hecl

hecl/blender/BlenderConnection.cpp

@@ -375,6 +375,7 @@ static const char* BlendTypeStrs[] =
     "WORLD",
     "MAPAREA",
     "MAPUNIVERSE",
+    "FRAME",
     nullptr
 };
 

hecl/blender/BlenderConnection.hpp

@@ -43,7 +43,8 @@ public:
         Area,
         World,
         MapArea,
-        MapUniverse
+        MapUniverse,
+        Frame
     };
 private:
     bool m_lock = false;

hecl/blender/hecl/__init__.py

@@ -9,7 +9,7 @@ bl_info = {
     "category": "System"}
 
 # Package import
-from . import hmdl, sact, srea, swld, mapa, mapu, Nodegrid, Patching
+from . import hmdl, sact, srea, swld, mapa, mapu, frme, Nodegrid, Patching
 Nodegrid = Nodegrid.Nodegrid
 import bpy, os, sys
 from bpy.app.handlers import persistent
@@ -23,7 +23,8 @@ hecl_typeS = [
 ('AREA', "Area", "Active scene represents a HECL Area", srea.draw),
 ('WORLD', "World", "Active scene represents a HECL World", swld.draw),
 ('MAPAREA', "Map Area", "Active scene represents a HECL Map Area", mapa.draw),
-('MAPUNIVERSE', "Map Universe", "Active scene represents a HECL Map Universe", mapu.draw)]
+('MAPUNIVERSE', "Map Universe", "Active scene represents a HECL Map Universe", mapu.draw),
+('FRAME', "Gui Frame", "Active scene represents a HECL Gui Frame", frme.draw)]
 
 # Main Scene Panel
 class hecl_scene_panel(bpy.types.Panel):

hecl/blender/hecl/frme.py

@@ -0,0 +1,2 @@
+def draw(layout, context):
+    pass

hecl/driver/CMakeLists.txt

@@ -25,4 +25,4 @@ endif()
 target_link_libraries(hecl
     ${DATA_SPEC_LIBS}
     HECLDatabase HECLBackend HECLFrontend HECLBlender HECLCommon AthenaCore NOD
-    LogVisor AthenaLibYaml ${PNG_LIB} squish xxhash ${ZLIB_LIBRARIES} ${LZO_LIB} ${PLAT_LIBS})
+    LogVisor AthenaLibYaml ${PNG_LIB} squish xxhash Boo ${ZLIB_LIBRARIES} ${LZO_LIB} ${PLAT_LIBS} ${BOO_SYS_LIBS})