aboutsummaryrefslogtreecommitdiff
path: root/src/models.c
diff options
context:
space:
mode:
authorvictorfisac <victorfisac@gmail.com>2016-06-11 18:29:01 +0200
committervictorfisac <victorfisac@gmail.com>2016-06-11 18:29:01 +0200
commit1a60f376a4ebe4d0053a6ea308ee2b399d8c345d (patch)
tree2168bb09d221f2478e3371b296106700c130a0e4 /src/models.c
parent77f599885dade4930fb01baca22db6e2ae0c9f20 (diff)
parent27ba7de1e4a9d262b2f3039433977d6cffa1da8d (diff)
downloadraylib-1a60f376a4ebe4d0053a6ea308ee2b399d8c345d.tar.gz
raylib-1a60f376a4ebe4d0053a6ea308ee2b399d8c345d.zip
Merge remote-tracking branch 'refs/remotes/raysan5/develop' into develop
Diffstat (limited to 'src/models.c')
-rw-r--r--src/models.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/models.c b/src/models.c
index 15565c98..8deabcb0 100644
--- a/src/models.c
+++ b/src/models.c
@@ -50,7 +50,7 @@
//----------------------------------------------------------------------------------
// Global Variables Definition
//----------------------------------------------------------------------------------
-extern unsigned int whiteTexture;
+// ...
//----------------------------------------------------------------------------------
// Module specific Functions Declaration
@@ -739,7 +739,7 @@ Model LoadCubicmap(Image cubicmap)
{
Model model = { 0 };
- model.mesh = GenMeshCubicmap(cubicmap, (Vector3){ 1.0, 1.0, 1.5f });
+ model.mesh = GenMeshCubicmap(cubicmap, (Vector3){ 1.0f, 1.5f, 1.0f });
rlglLoadMesh(&model.mesh, false); // Upload vertex data to GPU (static model)
@@ -811,7 +811,7 @@ void UnloadMaterial(Material material)
// Link a texture to a model
void SetModelTexture(Model *model, Texture2D texture)
{
- if (texture.id <= 0) model->material.texDiffuse.id = whiteTexture; // Use default white texture
+ if (texture.id <= 0) model->material.texDiffuse = GetDefaultTexture(); // Use default white texture
else model->material.texDiffuse = texture;
}