diff options
| author | victorfisac <[email protected]> | 2016-07-05 11:57:05 +0200 |
|---|---|---|
| committer | victorfisac <[email protected]> | 2016-07-05 11:57:05 +0200 |
| commit | 1aecd5be072083e27e4289499865b5681f1ea656 (patch) | |
| tree | 808159aa95df9b2be5509d83791aa6cad4ddf6b8 /games | |
| parent | 1b0996fb0bcf68e2a14bc6260c6f2c5366ab033f (diff) | |
| parent | 2ff2096b36d80078cbda5e61ff77d7fedeeeaeb5 (diff) | |
| download | raylib-1aecd5be072083e27e4289499865b5681f1ea656.tar.gz raylib-1aecd5be072083e27e4289499865b5681f1ea656.zip | |
Merge remote-tracking branch 'refs/remotes/raysan5/develop' into develop
Diffstat (limited to 'games')
| -rw-r--r-- | games/raylib_demo/raylib_demo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/games/raylib_demo/raylib_demo.c b/games/raylib_demo/raylib_demo.c index 7f6f291a..22213b46 100644 --- a/games/raylib_demo/raylib_demo.c +++ b/games/raylib_demo/raylib_demo.c @@ -202,8 +202,8 @@ int main() camera = (Camera){{ 0.0, 12.0, 15.0 }, { 0.0, 3.0, 0.0 }, { 0.0, 1.0, 0.0 }}; catTexture = LoadTexture("resources/catsham.png"); // Load model texture - cat = LoadModel("resources/cat.obj"); // Load OBJ model - SetModelTexture(&cat, catTexture); + cat = LoadModel("resources/cat.obj"); // Load OBJ model + cat.material.texDiffuse = texture; // Set cat model diffuse texture fxWav = LoadSound("resources/audio/weird.wav"); // Load WAV audio file fxOgg = LoadSound("resources/audio/tanatana.ogg"); // Load OGG audio file |