Don't complain if normal maps can't be loaded

git-svn-id: svn://cook.msm.cam.ac.uk:745/thrust3d/thrust3d@189 84d2e878-0bd5-11dd-ad15-13eda11d74c5

1 files changed, 4 insertions, 2 deletions

diff --git a/src/texture.c b/src/texture.c
index 9079a3e..9476d75 100644
--- a/src/texture.c
+++ b/src/texture.c
@@ -39,7 +39,6 @@ static int texture_load_png(char *filename, GLuint *name) {
 	/* Open file */
 	fh = fopen(filename, "rb");
 	if ( !fh ) {
-		fprintf(stderr, "Couldn't open texture file '%s'\n", filename);
 		return 1;
 	}
 	
@@ -154,7 +153,10 @@ void texture_load(RenderContext *ctx, char *name) {
 	snprintf(colourmap_filename, 255, "%s/textures/%s.png", DATADIR, name);
 	snprintf(normalmap_filename, 255, "%s/textures/%s-normals.png", DATADIR, name);
 	
-	if ( texture_load_png(colourmap_filename, &colourmap) != 0 ) return;
+	if ( texture_load_png(colourmap_filename, &colourmap) != 0 ) {
+		fprintf(stderr, "Couldn't load texture '%s'\n", name);
+		return;
+	}
 	ctx->textures[ctx->num_textures].texname = colourmap;
 	
 	if ( texture_load_png(normalmap_filename, &normalmap) == 0 ) {