diff --git a/hecl/blender/BlenderConnection.cpp b/hecl/blender/BlenderConnection.cpp index 59547e52f..89c065c5f 100644 --- a/hecl/blender/BlenderConnection.cpp +++ b/hecl/blender/BlenderConnection.cpp @@ -375,6 +375,7 @@ static const char* BlendTypeStrs[] = "WORLD", "MAPAREA", "MAPUNIVERSE", + "FRAME", nullptr }; diff --git a/hecl/blender/BlenderConnection.hpp b/hecl/blender/BlenderConnection.hpp index 9c190aa06..a3ab597c4 100644 --- a/hecl/blender/BlenderConnection.hpp +++ b/hecl/blender/BlenderConnection.hpp @@ -43,7 +43,8 @@ public: Area, World, MapArea, - MapUniverse + MapUniverse, + Frame }; private: bool m_lock = false; diff --git a/hecl/blender/hecl/__init__.py b/hecl/blender/hecl/__init__.py index abdb0be85..f821c3cfc 100644 --- a/hecl/blender/hecl/__init__.py +++ b/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): diff --git a/hecl/blender/hecl/frme.py b/hecl/blender/hecl/frme.py new file mode 100644 index 000000000..6f866f4a3 --- /dev/null +++ b/hecl/blender/hecl/frme.py @@ -0,0 +1,2 @@ +def draw(layout, context): + pass diff --git a/hecl/driver/CMakeLists.txt b/hecl/driver/CMakeLists.txt index 826794b79..46d406b4b 100644 --- a/hecl/driver/CMakeLists.txt +++ b/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})