[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56412] trunk/blender/source/blender: Bug fix #35143

[Ton Roosendaal]

Revision: 56412
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56412
Author:   ton
Date:     2013-04-30 11:11:18 +0000 (Tue, 30 Apr 2013)
Log Message:
-----------
Bug fix #35143

Animplayer treated .tif extensions as movie files, so that didn't work.
Added another hardcoded check for it, like for png tga exr jpg etc.

Why FFmpeg thinks .tif is a movie... that's for another day :)
Quicktime QTKit did same btw.

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/util.c
    trunk/blender/source/blender/quicktime/apple/qtkit_import.m
    trunk/blender/source/blender/quicktime/apple/quicktime_import.c

Modified: trunk/blender/source/blender/imbuf/intern/util.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/util.c	2013-04-30 10:32:02 UTC (rev 56411)
+++ trunk/blender/source/blender/imbuf/intern/util.c	2013-04-30 11:11:18 UTC (rev 56412)
@@ -297,6 +297,7 @@
 	    BLI_testextensie(filename, ".dds") ||
 	    BLI_testextensie(filename, ".tga") ||
 	    BLI_testextensie(filename, ".bmp") ||
+	    BLI_testextensie(filename, ".tif") ||
 	    BLI_testextensie(filename, ".exr") ||
 	    BLI_testextensie(filename, ".cin") ||
 	    BLI_testextensie(filename, ".wav"))

Modified: trunk/blender/source/blender/quicktime/apple/qtkit_import.m
===================================================================
--- trunk/blender/source/blender/quicktime/apple/qtkit_import.m	2013-04-30 10:32:02 UTC (rev 56411)
+++ trunk/blender/source/blender/quicktime/apple/qtkit_import.m	2013-04-30 11:11:18 UTC (rev 56412)
@@ -94,6 +94,8 @@
 	    BLI_testextensie(name, ".png") ||
 	    BLI_testextensie(name, ".bmp") ||
 	    BLI_testextensie(name, ".jpg") ||
+	    BLI_testextensie(name, ".tif") ||
+	    BLI_testextensie(name, ".exr") ||
 	    BLI_testextensie(name, ".wav") ||
 	    BLI_testextensie(name, ".zip") ||
 	    BLI_testextensie(name, ".mp3"))

Modified: trunk/blender/source/blender/quicktime/apple/quicktime_import.c
===================================================================
--- trunk/blender/source/blender/quicktime/apple/quicktime_import.c	2013-04-30 10:32:02 UTC (rev 56411)
+++ trunk/blender/source/blender/quicktime/apple/quicktime_import.c	2013-04-30 11:11:18 UTC (rev 56412)
@@ -200,6 +200,8 @@
 	    BLI_testextensie(name, ".png") ||
 	    BLI_testextensie(name, ".bmp") ||
 	    BLI_testextensie(name, ".jpg") ||
+	    BLI_testextensie(name, ".tif") ||
+	    BLI_testextensie(name, ".exr") ||
 	    BLI_testextensie(name, ".wav") ||
 	    BLI_testextensie(name, ".zip") ||
 	    BLI_testextensie(name, ".mp3"))