[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [1913] trunk/py/scripts/addons/ io_scene_obj/import_obj.py: minor syntax change

Campbell Barton ideasman42 at gmail.com
Tue May 10 09:55:42 CEST 2011


Revision: 1913
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=1913
Author:   campbellbarton
Date:     2011-05-10 07:55:42 +0000 (Tue, 10 May 2011)
Log Message:
-----------
minor syntax change

Modified Paths:
--------------
    trunk/py/scripts/addons/io_scene_obj/import_obj.py

Modified: trunk/py/scripts/addons/io_scene_obj/import_obj.py
===================================================================
--- trunk/py/scripts/addons/io_scene_obj/import_obj.py	2011-05-10 06:43:14 UTC (rev 1912)
+++ trunk/py/scripts/addons/io_scene_obj/import_obj.py	2011-05-10 07:55:42 UTC (rev 1913)
@@ -374,7 +374,7 @@
 
     #Create new materials
     for name in unique_materials:  # .keys()
-        if name != None:
+        if name is not None:
             unique_materials[name] = bpy.data.materials.new(name.decode('utf-8', "replace"))
             unique_material_images[name] = None, False  # assign None to all material images to start with, add to later.
 
@@ -396,10 +396,7 @@
                     pass
                 elif line.startswith(b'newmtl'):
                     context_material_name = line_value(line.split())
-                    if context_material_name in unique_materials:
-                        context_material = unique_materials[context_material_name]
-                    else:
-                        context_material = None
+                    context_material = unique_materials.get(context_material_name)
 
                 elif context_material:
                     # we need to make a material to assign properties to it.



More information about the Bf-extensions-cvs mailing list