Changeset 11211 for code/branches/ogre1.9/data/gui/scripts/GUISheet.lua

Timestamp:

Jul 5, 2016, 11:46:10 PM (8 years ago)

Author:

bknecht

Message:

Merging cegui0.8 branch into ogre1.9 branch

Location:

code/branches/ogre1.9

Files:

• . (modified) (1 prop)
• data/gui/scripts/GUISheet.lua (modified) (1 diff)

code/branches/ogre1.9/data/gui/scripts/GUISheet.lua

@@ -66 +66 @@
 function P:load()
     -- Load the layout that describes the sheet
-    self.window = winMgr:loadWindowLayout(self.name .. ".layout")
+    self.window = winMgr:loadLayoutFromFile(self.name .. ".layout")
     if self.window == nil then
         error("Could not load layout file for GUI sheet '"..self.name.."'")