[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [1573] trunk/py/scripts/addons: some corrections for errors registering classes.

[Campbell Barton]

Revision: 1573
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=1573
Author:   campbellbarton
Date:     2011-02-11 02:57:30 +0000 (Fri, 11 Feb 2011)
Log Message:
-----------
some corrections for errors registering classes.

Modified Paths:
--------------
    trunk/py/scripts/addons/io_import_scene_dxf.py
    trunk/py/scripts/addons/io_scene_m3/__init__.py
    trunk/py/scripts/addons/render_povray/__init__.py

Modified: trunk/py/scripts/addons/io_import_scene_dxf.py
===================================================================
--- trunk/py/scripts/addons/io_import_scene_dxf.py	2011-02-11 02:43:51 UTC (rev 1572)
+++ trunk/py/scripts/addons/io_import_scene_dxf.py	2011-02-11 02:57:30 UTC (rev 1573)
@@ -2503,19 +2503,23 @@
         wm.fileselect_add(self)
         return {'RUNNING_MODAL'}
 
+
 def menu_func(self, context):
     self.layout.operator(IMPORT_OT_autocad_dxf.bl_idname, text="Autocad (.dxf)")
 
+
 def register():
     bpy.utils.register_module(__name__)
 
-     bpy.types.INFO_MT_file_import.append(menu_func)
+    bpy.types.INFO_MT_file_import.append(menu_func)
+
  
 def unregister():
     bpy.utils.unregister_module(__name__)
 
     bpy.types.INFO_MT_file_import.remove(menu_func)
 
+
 if __name__ == "__main__":
     register()
 

Modified: trunk/py/scripts/addons/io_scene_m3/__init__.py
===================================================================
--- trunk/py/scripts/addons/io_scene_m3/__init__.py	2011-02-11 02:43:51 UTC (rev 1572)
+++ trunk/py/scripts/addons/io_scene_m3/__init__.py	2011-02-11 02:57:30 UTC (rev 1573)
@@ -35,22 +35,18 @@
     "category": "Import-Export",
     "description": "This script imports m3 format files to Blender."}
 
+if "bpy" in locals():
+    import imp
+    imp.reload(import_m3)
+    #imp.reload(export_m3)
+else:
+    pass
+    #from . import import_m3
+    #from . import export_m3
+
 import bpy
 
-try:
-    init_data
-
-    reload(import_m3)
-    #reload(export_m3)
-except:
-    from io_mesh_m3 import import_m3
-    #from io_mesh_m3 import export_m3
-
-init_data = True
-
-
 def menu_import(self, context):
-    from io_mesh_m3 import import_m3
     self.layout.operator(import_m3.M3Importer.bl_idname, \
         text="Blizzard M3 (.m3)").filepath = "*.m3"
 
@@ -63,6 +59,7 @@
 #        text="Raw Faces (.raw)").filepath = default_path
 
 def register():
+    from . import import_m3
     bpy.utils.register_module(__name__)
 
     bpy.types.INFO_MT_file_import.append(menu_import)

Modified: trunk/py/scripts/addons/render_povray/__init__.py
===================================================================
--- trunk/py/scripts/addons/render_povray/__init__.py	2011-02-11 02:43:51 UTC (rev 1572)
+++ trunk/py/scripts/addons/render_povray/__init__.py	2011-02-11 02:57:30 UTC (rev 1573)
@@ -405,9 +405,10 @@
 
 
 def unregister():
+    import bpy
+
     bpy.utils.unregister_module(__name__)
 
-    import bpy
     Scene = bpy.types.Scene
     Mat = bpy.types.Material
     Tex = bpy.types.Texture