OSDN Git Service
(root)
/
mikumikustudio
/
libgdx-mikumikustudio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a19b9a3
)
Fixed Skin.getTiledDrawable
author
hneuer
<hanno.neuer@gmail.com>
Sun, 15 Sep 2013 10:43:26 +0000
(12:43 +0200)
committer
hneuer
<hanno.neuer@gmail.com>
Sun, 15 Sep 2013 10:43:26 +0000
(12:43 +0200)
gdx/src/com/badlogic/gdx/scenes/scene2d/ui/Skin.java
patch
|
blob
|
history
diff --git
a/gdx/src/com/badlogic/gdx/scenes/scene2d/ui/Skin.java
b/gdx/src/com/badlogic/gdx/scenes/scene2d/ui/Skin.java
index
dec0b29
..
0715992
100644
(file)
--- a/
gdx/src/com/badlogic/gdx/scenes/scene2d/ui/Skin.java
+++ b/
gdx/src/com/badlogic/gdx/scenes/scene2d/ui/Skin.java
@@
-188,12
+188,12
@@
public class Skin implements Disposable {
if (tiled != null) return tiled;
\r
\r
Drawable drawable = optional(name, Drawable.class);
\r
- if (
tiled
!= null) {
\r
+ if (
drawable
!= null) {
\r
if (!(drawable instanceof TiledDrawable)) {
\r
throw new GdxRuntimeException("Drawable found but is not a TiledDrawable: " + name + ", "
\r
+ drawable.getClass().getName());
\r
}
\r
- return
tiled
;
\r
+ return
(TiledDrawable)drawable
;
\r
}
\r
\r
tiled = new TiledDrawable(getRegion(name));
\r