Merge remote-tracking branch 'origin/master'

# Conflicts: # imgui-core/src/main/kotlin/imgui/internal/draw.kt
kotlin-graphics · Mar 3, 2020 · 7881207 · 7881207
2 parents 4c9c91d + 66076a2
commit 7881207
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/imgui-core/src/main/kotlin/imgui/internal/draw.kt b/imgui-core/src/main/kotlin/imgui/internal/draw.kt
@@ -343,11 +343,12 @@ class DrawData {
         val ret = DrawData()
 
         ret.cmdLists.addAll(cmdLists) // TODO check if it's fine https://github.com/kotlin-graphics/imgui/pull/135
-        ret.displayPos = displayPos
-        ret.displaySize = displaySize
+        ret.displayPos put displayPos
+        ret.displaySize put displaySize
         ret.totalIdxCount = totalIdxCount
         ret.totalVtxCount = totalVtxCount
         ret.valid = valid
+        ret.framebufferScale put framebufferScale
 
         return ret
     }