[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [1304] trunk/py/scripts/addons: use imp .reload() rather then reload().
Campbell Barton
ideasman42 at gmail.com
Wed Dec 22 22:41:21 CET 2010
Revision: 1304
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-extensions&revision=1304
Author: campbellbarton
Date: 2010-12-22 22:41:21 +0100 (Wed, 22 Dec 2010)
Log Message:
-----------
use imp.reload() rather then reload().
Modified Paths:
--------------
trunk/py/scripts/addons/add_mesh_BoltFactory/__init__.py
trunk/py/scripts/addons/add_mesh_extras.py
trunk/py/scripts/addons/io_coat3D/__init__.py
trunk/py/scripts/addons/io_convert_image_to_mesh_img/__init__.py
trunk/py/scripts/addons/io_export_anim_mesh_xna/__init__.py
trunk/py/scripts/addons/io_mesh_raw/__init__.py
trunk/py/scripts/addons/io_mesh_stl/__init__.py
trunk/py/scripts/addons/object_fracture/__init__.py
trunk/py/scripts/addons/render_povray/__init__.py
trunk/py/scripts/addons/rigify/__init__.py
trunk/py/scripts/addons/rigify/rigs/biped/arm/__init__.py
trunk/py/scripts/addons/rigify/rigs/biped/leg/__init__.py
trunk/py/scripts/addons/rigify/ui.py
trunk/py/scripts/addons/rigify/utils.py
trunk/py/scripts/addons/space_view3d_math_vis/__init__.py
Modified: trunk/py/scripts/addons/add_mesh_BoltFactory/__init__.py
===================================================================
--- trunk/py/scripts/addons/add_mesh_BoltFactory/__init__.py 2010-12-22 18:46:29 UTC (rev 1303)
+++ trunk/py/scripts/addons/add_mesh_BoltFactory/__init__.py 2010-12-22 21:41:21 UTC (rev 1304)
@@ -29,16 +29,13 @@
"func=detail&aid=22842&group_id=153&atid=468",
"category": "Add Mesh"}
-import bpy
-
-try:
- init_data
-
- reload(Boltfactory)
-except:
+if "bpy" in locals():
+ import imp
+ imp.reload(Boltfactory)
+else:
from add_mesh_BoltFactory import Boltfactory
-init_data = True
+import bpy
################################################################################
##### REGISTER #####
Modified: trunk/py/scripts/addons/add_mesh_extras.py
===================================================================
--- trunk/py/scripts/addons/add_mesh_extras.py 2010-12-22 18:46:29 UTC (rev 1303)
+++ trunk/py/scripts/addons/add_mesh_extras.py 2010-12-22 21:41:21 UTC (rev 1304)
@@ -635,7 +635,7 @@
layout.operator_context = 'INVOKE_REGION_WIN'
layout.operator("mesh.primitive_sqorus_add",
text="Sqorus")
- layout.operator("mesh.primitive_wedge_add",
+ layout.operator("mesh.primitive_wedge_add")
layout.operator("mesh.primitive_star_add",
text="Star")
layout.operator("mesh.primitive_trapezohedron_add",
Modified: trunk/py/scripts/addons/io_coat3D/__init__.py
===================================================================
--- trunk/py/scripts/addons/io_coat3D/__init__.py 2010-12-22 18:46:29 UTC (rev 1303)
+++ trunk/py/scripts/addons/io_coat3D/__init__.py 2010-12-22 21:41:21 UTC (rev 1304)
@@ -32,17 +32,18 @@
"category": "Import/Export"}
+if "bpy" in locals():
+ import imp
+ imp.reload(coat)
+ imp.reload(tex)
+else:
+ from . import coat
+ from . import tex
-#if "bpy" in locals(): Don't know if this is important
-# reload(render)
-# reload(ui)
-
-#else:
import bpy
from bpy.props import *
-from io_coat3D import coat
-from io_coat3D import tex
+
def register():
bpy.coat3D = dict()
Modified: trunk/py/scripts/addons/io_convert_image_to_mesh_img/__init__.py
===================================================================
--- trunk/py/scripts/addons/io_convert_image_to_mesh_img/__init__.py 2010-12-22 18:46:29 UTC (rev 1303)
+++ trunk/py/scripts/addons/io_convert_image_to_mesh_img/__init__.py 2010-12-22 21:41:21 UTC (rev 1304)
@@ -39,18 +39,19 @@
"func=detail&aid=24897&group_id=153&atid=467",
"category": "Import/Export"}
+
+if "bpy" in locals():
+ import imp
+ imp.reload(import_img)
+else:
+ from . import import_img
+
+
import bpy
from bpy.props import *
from io_utils import ImportHelper
-try:
- init_data
- reload( io_convert_image_to_mesh_img.import_img )
-except:
- import io_convert_image_to_mesh_img.import_img
-init_data = True
-
class ImportHiRISEIMGDTM(bpy.types.Operator, ImportHelper):
'''Import a HiRISE DTM formatted as a PDS IMG file'''
bl_idname = "import_shape.img"
@@ -59,14 +60,13 @@
filename_ext = ".IMG"
filter_glob = StringProperty(default="*.IMG", options={'HIDDEN'})
- scale = FloatProperty(
- name="Scale",
- description="Scale the IMG by this value",
- min=0.0001,
- max=10.0,
- soft_min=0.001,
- soft_max=100.0,
- default=0.01)
+ scale = FloatProperty(name="Scale",
+ description="Scale the IMG by this value",
+ min=0.0001,
+ max=10.0,
+ soft_min=0.001,
+ soft_max=100.0,
+ default=0.01)
bin_mode = EnumProperty(items=(
('NONE', "None", "Don't bin the image"),
@@ -79,7 +79,7 @@
name="Binning",
description="Import Binning.",
default='BIN12-FAST'
- )
+ )
#red_material = BoolProperty(name="Mars Red Mesh",
# description="Set the mesh as a 'Mars' red value",
Modified: trunk/py/scripts/addons/io_export_anim_mesh_xna/__init__.py
===================================================================
--- trunk/py/scripts/addons/io_export_anim_mesh_xna/__init__.py 2010-12-22 18:46:29 UTC (rev 1303)
+++ trunk/py/scripts/addons/io_export_anim_mesh_xna/__init__.py 2010-12-22 21:41:21 UTC (rev 1304)
@@ -36,20 +36,21 @@
# To support reload properly, try to access a package var, if it's there, reload everything
if "bpy" in locals():
- import sys
- reload(sys.modules.get("io_export_anim_mesh_xna.export_xna", sys))
+ import imp
+ if "export_xna" in locals():
+ imp.reload(export_xna)
import bpy
# Add each additional script in a simlar block to this
def menu_export_fbx_model(self, context):
- from io_export_anim_mesh_xna import export_xna
+ from . import export_xna
import os
default_path = os.path.splitext(bpy.data.filepath)[0] + ".fbx"
self.layout.operator(export_xna.ExportFBXmodel.bl_idname, text="XNA FBX Model only (.fbx)").filepath = default_path
def menu_export_fbx_takes(self, context):
- from io_export_anim_mesh_xna import export_xna
+ from . import export_xna
import os
# get the current action name
currentAction = ""
@@ -63,7 +64,7 @@
self.layout.operator(export_xna.ExportFBXtakes.bl_idname, text="XNA FBX Animations only (.fbx)").filepath = default_path
def menu_export_fbx_animated(self, context):
- from io_export_anim_mesh_xna import export_xna
+ from . import export_xna
import os
default_path = os.path.splitext(bpy.data.filepath)[0] + ".fbx"
self.layout.operator(export_xna.ExportFBXanimated.bl_idname, text="XNA FBX Animated Model (.fbx)").filepath = default_path
Modified: trunk/py/scripts/addons/io_mesh_raw/__init__.py
===================================================================
--- trunk/py/scripts/addons/io_mesh_raw/__init__.py 2010-12-22 18:46:29 UTC (rev 1303)
+++ trunk/py/scripts/addons/io_mesh_raw/__init__.py 2010-12-22 21:41:21 UTC (rev 1304)
@@ -31,27 +31,22 @@
"func=detail&aid=21733&group_id=153&atid=469",
"category": "Import/Export"}
-import bpy
+if "bpy" in locals():
+ import imp
+ imp.reload(import_raw)
+ imp.reload(export_raw)
+else:
+ from . import import_raw
+ from . import export_raw
-try:
- init_data
+import bpy
- reload(import_raw)
- reload(export_raw)
-except:
- from io_mesh_raw import import_raw
- from io_mesh_raw import export_raw
-
-init_data = True
-
def menu_import(self, context):
- from io_mesh_raw import import_raw
self.layout.operator(import_raw.RawImporter.bl_idname, text="Raw Faces (.raw)").filepath = "*.raw"
def menu_export(self, context):
- from io_mesh_raw import export_raw
import os
default_path = os.path.splitext(bpy.data.filepath)[0] + ".raw"
self.layout.operator(export_raw.RawExporter.bl_idname, text="Raw Faces (.raw)").filepath = default_path
Modified: trunk/py/scripts/addons/io_mesh_stl/__init__.py
===================================================================
--- trunk/py/scripts/addons/io_mesh_stl/__init__.py 2010-12-22 18:46:29 UTC (rev 1303)
+++ trunk/py/scripts/addons/io_mesh_stl/__init__.py 2010-12-22 21:41:21 UTC (rev 1304)
@@ -46,6 +46,14 @@
- Does not handle endien
"""
+if "bpy" in locals():
+ import imp
+ imp.reload(stl_utils)
+ imp.reload(blender_utils)
+else:
+ from . import stl_utils
+ from . import blender_utils
+
import itertools
import os
@@ -54,18 +62,6 @@
from io_utils import ExportHelper, ImportHelper
-try:
- init_data
-
- reload(stl_utils)
- reload(blender_utils)
-except:
- from io_mesh_stl import stl_utils
- from io_mesh_stl import blender_utils
-
-init_data = True
-
-
class StlImporter(bpy.types.Operator, ImportHelper):
'''
Load STL triangle mesh data
Modified: trunk/py/scripts/addons/object_fracture/__init__.py
===================================================================
--- trunk/py/scripts/addons/object_fracture/__init__.py 2010-12-22 18:46:29 UTC (rev 1303)
+++ trunk/py/scripts/addons/object_fracture/__init__.py 2010-12-22 21:41:21 UTC (rev 1304)
@@ -32,19 +32,17 @@
"category": "Object"}
+if "bpy" in locals():
+ import imp
+ imp.reload(fracture_ops)
+ imp.reload(fracture_setup)
+else:
+ from . import fracture_ops
+ from . import fracture_setup
+
import bpy
-try:
- init_data
-
- reload(fracture_ops)
- reload(fracture_setup)
-except:
- from object_fracture import fracture_ops
- from object_fracture import fracture_setup
-init_data = True
-
class INFO_MT_add_fracture_objects(bpy.types.Menu):
bl_idname = "INFO_MT_add_fracture_objects"
bl_label = "Fracture Helper Objects"
Modified: trunk/py/scripts/addons/render_povray/__init__.py
===================================================================
--- trunk/py/scripts/addons/render_povray/__init__.py 2010-12-22 18:46:29 UTC (rev 1303)
+++ trunk/py/scripts/addons/render_povray/__init__.py 2010-12-22 21:41:21 UTC (rev 1304)
@@ -33,8 +33,9 @@
if "bpy" in locals():
- reload(ui)
- reload(render)
+ import imp
+ imp.reload(ui)
+ imp.reload(render)
else:
import bpy
Modified: trunk/py/scripts/addons/rigify/__init__.py
===================================================================
--- trunk/py/scripts/addons/rigify/__init__.py 2010-12-22 18:46:29 UTC (rev 1303)
+++ trunk/py/scripts/addons/rigify/__init__.py 2010-12-22 21:41:21 UTC (rev 1304)
@@ -28,12 +28,13 @@
"category": "Rigging"}
if "bpy" in locals():
- reload(generate)
- reload(ui)
- reload(utils)
- reload(metarig_menu)
+ import imp
+ imp.reload(generate)
+ imp.reload(ui)
+ imp.reload(utils)
+ imp.reload(metarig_menu)
else:
- from rigify import generate, ui, utils, metarig_menu
+ from . import generate, ui, utils, metarig_menu
import bpy
import bpy_types
Modified: trunk/py/scripts/addons/rigify/rigs/biped/arm/__init__.py
===================================================================
--- trunk/py/scripts/addons/rigify/rigs/biped/arm/__init__.py 2010-12-22 18:46:29 UTC (rev 1303)
+++ trunk/py/scripts/addons/rigify/rigs/biped/arm/__init__.py 2010-12-22 21:41:21 UTC (rev 1304)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list