Skip to content

editor: Fix #142 #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Nov 2, 2020
Merged

editor: Fix #142 #155

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8f897a2
Fix save dimension
FileEX Jun 13, 2019
b0fa577
Merge remote-tracking branch 'upstream/master' into bugfix-dim
patrikjuvonen Apr 1, 2020
b23aabb
Update elementproperties.lua
FileEX Jun 1, 2020
b57baad
Update dumpxml.lua
FileEX Jun 1, 2020
9100c66
Update saveloadtest_server.lua
FileEX Jun 1, 2020
594a05d
Update synchronization.lua
FileEX Jun 1, 2020
b3c895a
Fix pottential error
FileEX Jun 2, 2020
38929be
Fix pottential error
FileEX Jun 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions [editor]/editor_gui/client/elementproperties.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,7 @@ local commonApplier = {
return edf.edfSetElementRotation(selectedElement, unpack(control:getValue()))
end,
dimension = function(control)
local dimension = control:getValue()
if dimension then
return setElementData(selectedElement, "me:dimension", dimension)
else
return false
end
return edf.edfSetElementDimension(selectedElement, control:getValue())
end,
interior = function(control)
return edf.edfSetElementInterior(selectedElement, control:getValue())
Expand Down
2 changes: 1 addition & 1 deletion [editor]/editor_main/server/dumpxml.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ end
local specialSyncers = {
position = function() end,
rotation = function() end,
dimension = function(element) return 0 end,
dimension = function(element) return edf.edfGetElementDimension(element) end,
interior = function(element) return edf.edfGetElementInterior(element) end,
alpha = function(element) return edf.edfGetElementAlpha(element) end,
parent = function(element) return getElementData(element, "me:parent") end,
Expand Down
2 changes: 1 addition & 1 deletion [editor]/editor_main/server/saveloadtest_server.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ addEventHandler ( "saveResource", rootElement, saveResource )
local specialSyncers = {
position = function() end,
rotation = function() end,
dimension = function(element) return 0 end,
dimension = function(element) return edf.edfGetElementDimension(element) end,
interior = function(element) return edf.edfGetElementInterior(element) end,
alpha = function(element) return edf.edfGetElementAlpha(element) end,
parent = function(element) return getElementData(element, "me:parent") end,
Expand Down
2 changes: 1 addition & 1 deletion [editor]/editor_main/server/synchronization.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ local function syncElementRotation(element, value)
end

local function syncElementDimension(element, dim)
setElementData(element, "me:dimension", dim)
edf.edfSetElementDimension(element, dim)
end

local function syncElementInterior(element, int)
Expand Down