X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Futil.py;h=ca13875befe31aeae05433d84ebc04ae073b5342;hb=c3ebbcb56c1ca9bb3022a7f49aab1da5e09150ba;hp=7e932df382791007e3151beff6d4cc41bf5301ad;hpb=e891021affc89a329d65b526744ebd38589cae32;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/util.py b/blender/io_mspgl/util.py
index 7e932df3..ca13875b 100644
--- a/blender/io_mspgl/util.py
+++ b/blender/io_mspgl/util.py
@@ -46,15 +46,25 @@ class Progress:
 
 	def set_progress(self, value):
 		value = self.start+self.delta*value
-		if value>self.last+0.01:
+		if value>self.last+0.001:
 			if self.window_manager:
 				self.window_manager.progress_update(value)
 			self.last = value
 
 
-def image_name(img):
-	fp = img.filepath
-	if fp:
-		return os.path.split(fp)[1]
+def linear_to_srgb(l):
+	if l<0.0031308:
+		return 12.92*l
 	else:
-		return img.name
+		return 1.055*(l**(1/2.4))-0.055
+
+def get_colormap(srgb):
+	if srgb:
+		return linear_to_srgb
+	else:
+		return lambda x: x
+
+def basename(path):
+	if path.startswith("//"):
+		path = path[2:]
+	return os.path.basename(path)