[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [2733] trunk/py/scripts/addons: add back 3ds import image search option

[Campbell Barton]

Revision: 2733
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=2733
Author:   campbellbarton
Date:     2011-12-05 23:02:46 +0000 (Mon, 05 Dec 2011)
Log Message:
-----------
add back 3ds import image search option

Modified Paths:
--------------
    trunk/py/scripts/addons/io_scene_3ds/import_3ds.py
    trunk/py/scripts/addons/paint_palette.py

Modified: trunk/py/scripts/addons/io_scene_3ds/import_3ds.py
===================================================================
--- trunk/py/scripts/addons/io_scene_3ds/import_3ds.py	2011-12-05 23:01:34 UTC (rev 2732)
+++ trunk/py/scripts/addons/io_scene_3ds/import_3ds.py	2011-12-05 23:02:46 UTC (rev 2733)
@@ -614,20 +614,16 @@
             data = list(struct.unpack('<ffffffffffff', temp_data))
             new_chunk.bytes_read += STRUCT_SIZE_4x3MAT
 
-            contextMatrix_rot = mathutils.Matrix((data[:3] + [0], \
-                                                  data[3:6] + [0], \
-                                                  data[6:9] + [0], \
-                                                  data[9:] + [1], \
+            contextMatrix_rot = mathutils.Matrix((data[:3] + [0],
+                                                  data[3:6] + [0],
+                                                  data[6:9] + [0],
+                                                  data[9:] + [1],
                                                   ))
 
         elif  (new_chunk.ID == MAT_MAP_FILEPATH):
             texture_name, read_str_len = read_string(file)
-            try:
-                TEXTURE_DICT[contextMaterial.name]
-            except:
-                #img = TEXTURE_DICT[contextMaterial.name]= BPyImage.comprehensiveImageLoad(texture_name, FILEPATH)
-                img = TEXTURE_DICT[contextMaterial.name] = load_image(texture_name, dirname)
-# 				img = TEXTURE_DICT[contextMaterial.name]= BPyImage.comprehensiveImageLoad(texture_name, FILEPATH, PLACE_HOLDER=False, RECURSIVE=IMAGE_SEARCH)
+            if contextMaterial.name not in TEXTURE_DICT:
+                TEXTURE_DICT[contextMaterial.name] = load_image(texture_name, dirname, place_holder=False, recursive=IMAGE_SEARCH)
 
             new_chunk.bytes_read += read_str_len  # plus one for the null character that gets removed
         elif new_chunk.ID == EDITKEYFRAME:

Modified: trunk/py/scripts/addons/paint_palette.py
===================================================================
--- trunk/py/scripts/addons/paint_palette.py	2011-12-05 23:01:34 UTC (rev 2732)
+++ trunk/py/scripts/addons/paint_palette.py	2011-12-05 23:02:46 UTC (rev 2733)
@@ -57,7 +57,6 @@
 
 def sample():
     pp = bpy.context.scene.palette_props
-    context = bpy.context
     current_color = pp.colors[pp.current_color_index]
     brush = current_brush()
     current_color.color = brush.color