Merge branch 'editor-dev' into dev

defold · Feb 20, 2024 · 660ab76 · 660ab76
2 parents afc47db + 558d43c
commit 660ab76
Show file tree

Hide file tree

Showing 4 changed files with 221 additions and 92 deletions.
diff --git a/editor/src/clj/editor/slice9.clj b/editor/src/clj/editor/slice9.clj
@@ -108,8 +108,8 @@
 
 (defn vertex-data
   [{:keys [width height tex-coords] :as _frame} size slice9 pivot]
-  (let [^double texture-width (or width 1.0)
-        ^double texture-height (or height 1.0)
+  (let [^double texture-width (or width (first size) 1.0)
+        ^double texture-height (or height (second size) 1.0)
         ;; Sample tex-coords if anim from tile source:
         ;;
         ;;  no flip:  [[0.0 0.140625] [0.0 1.0] [0.5566406 1.0] [0.5566406 0.140625]]   TL BL BR TR     T-B-B-T L-L-R-R