summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Bosveld <joel@JOEL-UBUNTU.(none)>2007-12-20 10:40:40 +0900
committerJoel Bosveld <joel@JOEL-UBUNTU.(none)>2007-12-20 10:40:40 +0900
commit9b367277872f87969e7cc70d2e23d76949077058 (patch)
tree0eaaa0fe8778d3d67cfe396e367bf3cb2d9771b5
parentb0688f1a31144dd864e8b931d60e72eacc4402c2 (diff)
downloadcubedbus-9b367277872f87969e7cc70d2e23d76949077058.tar.gz
cubedbus-9b367277872f87969e7cc70d2e23d76949077058.tar.bz2
Check for map_Kd or map_Ks in mtl file (as well as map_Ka).
If you specify more than 1 per material it will leak memory, but I hope to change that soon (as I think I am doing it wrong anyways)
-rw-r--r--cubedbusModel.c.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/cubedbusModel.c.in b/cubedbusModel.c.in
index 1a26cf3..9edd1d6 100644
--- a/cubedbusModel.c.in
+++ b/cubedbusModel.c.in
@@ -305,7 +305,7 @@ cubedbusAddModelObject (CubedbusObject *obj, CompOption *option, int nOption)
{
mtlPtr->Ns[0]=atof(strsep(&strline,delim));
}
- if(!strcmp(tmpType[0], "map_Ka")) /* XXX map_Kd and map_Ks */
+ if(!strcmp(tmpType[0], "map_Ka") || !strcmp(tmpType[0], "map_Kd") || !strcmp(tmpType[0], "map_Ks")) /* XXX map_Kd and map_Ks */
{
mtlPtr->tex=malloc(sizeof(CompTexture));