[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [4082] contrib/py/scripts/addons/ io_scene_ms3d: fix: issue with '_RestrictContext'
Alexander Nussbaumer
alpha-beta-release at gmx.net
Thu Dec 20 10:41:08 CET 2012
Revision: 4082
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=4082
Author: beta-tester
Date: 2012-12-20 09:41:07 +0000 (Thu, 20 Dec 2012)
Log Message:
-----------
fix: issue with '_RestrictContext'
Modified Paths:
--------------
contrib/py/scripts/addons/io_scene_ms3d/__init__.py
contrib/py/scripts/addons/io_scene_ms3d/ms3d_export.py
contrib/py/scripts/addons/io_scene_ms3d/ms3d_import.py
contrib/py/scripts/addons/io_scene_ms3d/ms3d_spec.py
contrib/py/scripts/addons/io_scene_ms3d/ms3d_ui.py
contrib/py/scripts/addons/io_scene_ms3d/ms3d_utils.py
Modified: contrib/py/scripts/addons/io_scene_ms3d/__init__.py
===================================================================
--- contrib/py/scripts/addons/io_scene_ms3d/__init__.py 2012-12-20 04:05:55 UTC (rev 4081)
+++ contrib/py/scripts/addons/io_scene_ms3d/__init__.py 2012-12-20 09:41:07 UTC (rev 4082)
@@ -19,19 +19,19 @@
# <pep8 compliant>
bl_info = {
- "name": "MilkShape3D MS3D format (.ms3d)",
- "description": "Import / Export MilkShape3D MS3D files"\
+ 'name': "MilkShape3D MS3D format (.ms3d)",
+ 'description': "Import / Export MilkShape3D MS3D files"\
" (conform with v1.8.4)",
- "author": "Alexander Nussbaumer",
- "version": (0, 7, 0, 1),
- "blender": (2, 65, 0),
- "location": "File > Import & File > Export",
- #"warning": "",
- "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/"
+ 'author': "Alexander Nussbaumer",
+ 'version': (0, 7, 0, 2),
+ 'blender': (2, 65, 0),
+ 'location': "File > Import & File > Export",
+ 'warning': "",
+ 'wiki_url': "http://wiki.blender.org/index.php/Extensions:2.6/Py/"
"Scripts/Import-Export/MilkShape3D_MS3D",
- "tracker_url": "http://projects.blender.org/tracker/index.php"
+ 'tracker_url': "http://projects.blender.org/tracker/index.php"
"?func=detail&aid=29404",
- "category": "Import-Export",
+ 'category': "Import-Export",
}
###############################################################################
Modified: contrib/py/scripts/addons/io_scene_ms3d/ms3d_export.py
===================================================================
--- contrib/py/scripts/addons/io_scene_ms3d/ms3d_export.py 2012-12-20 04:05:55 UTC (rev 4081)
+++ contrib/py/scripts/addons/io_scene_ms3d/ms3d_export.py 2012-12-20 09:41:07 UTC (rev 4082)
@@ -81,7 +81,6 @@
#import blender stuff
from bpy import (
- context,
ops,
)
import bmesh
@@ -136,15 +135,15 @@
post_setup_environment(self, blender_context)
# restore active object
- context.scene.objects.active = self.active_object
+ blender_context.scene.objects.active = self.active_object
- if ((not context.scene.objects.active)
- and (context.selected_objects)):
- context.scene.objects.active \
- = context.selected_objects[0]
+ if ((not blender_context.scene.objects.active)
+ and (blender_context.selected_objects)):
+ blender_context.scene.objects.active \
+ = blender_context.selected_objects[0]
# restore pre operator undo state
- context.user_preferences.edit.use_global_undo = self.undo
+ blender_context.user_preferences.edit.use_global_undo = self.undo
is_valid, statistics = ms3d_model.is_valid()
print()
@@ -264,7 +263,7 @@
True,
self.options.apply_modifiers_mode)
- enable_edit_mode(True)
+ enable_edit_mode(True, blender_context)
bm = bmesh.new()
bm.from_mesh(blender_mesh_temp)
@@ -453,7 +452,7 @@
if bm is not None:
bm.free()
- enable_edit_mode(False)
+ enable_edit_mode(False, blender_context)
##########################
# remove the temporary data
Modified: contrib/py/scripts/addons/io_scene_ms3d/ms3d_import.py
===================================================================
--- contrib/py/scripts/addons/io_scene_ms3d/ms3d_import.py 2012-12-20 04:05:55 UTC (rev 4081)
+++ contrib/py/scripts/addons/io_scene_ms3d/ms3d_import.py 2012-12-20 09:41:07 UTC (rev 4082)
@@ -238,7 +238,7 @@
blender_scene = blender_context.scene
blender_scene.objects.link(blender_mesh_object)
#blender_mesh_object.location = blender_scene.cursor_location
- enable_edit_mode(False)
+ enable_edit_mode(False, blender_context)
select_all(False)
blender_mesh_object.select = True
blender_scene.objects.active = blender_mesh_object
@@ -734,7 +734,7 @@
joint_length = 0.01
blender_scene.objects.active = blender_armature_object
- enable_edit_mode(True)
+ enable_edit_mode(True, blender_context)
for ms3d_joint in ms3d_joints_ordered:
blender_edit_bone = blender_armature.edit_bones.new(ms3d_joint.name)
blender_edit_bone.use_connect = False
@@ -764,10 +764,10 @@
ms3d_joint.blender_bone_name = blender_edit_bone.name
ms3d_joint.blender_edit_bone = blender_edit_bone
- enable_edit_mode(False)
+ enable_edit_mode(False, blender_context)
if self.options.joint_to_bones:
- enable_edit_mode(True)
+ enable_edit_mode(True, blender_context)
for ms3d_joint in ms3d_joints_ordered:
blender_edit_bone = blender_armature.edit_bones[ms3d_joint.name]
if blender_edit_bone.children:
@@ -780,11 +780,11 @@
direction = blender_edit_bone.tail - blender_edit_bone.head
direction.normalize()
blender_edit_bone.tail = blender_edit_bone.head + (direction * new_length)
- enable_edit_mode(False)
+ enable_edit_mode(False, blender_context)
##########################
# post process bones
- enable_edit_mode(False)
+ enable_edit_mode(False, blender_context)
for ms3d_joint_name, ms3d_joint in ms3d_joint_by_name.items():
blender_bone = blender_armature.bones.get(
ms3d_joint.blender_bone_name)
@@ -809,7 +809,7 @@
##########################
# process pose bones
- enable_pose_mode(True)
+ enable_pose_mode(True, blender_context)
blender_action = blender_context.blend_data.actions.new(ms3d_action_name)
if blender_armature_object.animation_data is None:
@@ -876,7 +876,7 @@
fcurve_rotation_y.keyframe_points.insert(frame, rotation_key_frames.rotation[2])
fcurve_rotation_z.keyframe_points.insert(frame, rotation_key_frames.rotation[1])
- enable_pose_mode(False)
+ enable_pose_mode(False, blender_context)
return blender_armature_object
Modified: contrib/py/scripts/addons/io_scene_ms3d/ms3d_spec.py
===================================================================
--- contrib/py/scripts/addons/io_scene_ms3d/ms3d_spec.py 2012-12-20 04:05:55 UTC (rev 4081)
+++ contrib/py/scripts/addons/io_scene_ms3d/ms3d_spec.py 2012-12-20 09:41:07 UTC (rev 4082)
@@ -130,7 +130,7 @@
DEFAULT_MATERIAL_SPECULAR = (1.0, 1.0, 1.0, 1.0)
DEFAULT_MATERIAL_EMISSIVE = (0.0, 0.0, 0.0, 1.0)
DEFAULT_MATERIAL_SHININESS = 12.5
-
+
DEFAULT_JOINT_COLOR = (0.8, 0.8, 0.8)
###############################################################################
Modified: contrib/py/scripts/addons/io_scene_ms3d/ms3d_ui.py
===================================================================
--- contrib/py/scripts/addons/io_scene_ms3d/ms3d_ui.py 2012-12-20 04:05:55 UTC (rev 4081)
+++ contrib/py/scripts/addons/io_scene_ms3d/ms3d_ui.py 2012-12-20 09:41:07 UTC (rev 4082)
@@ -332,7 +332,7 @@
# draw the option panel
- def draw(self, context):
+ def draw(self, blender_context):
layout = self.layout
box = layout.box()
@@ -369,7 +369,7 @@
return {'RUNNING_MODAL', }
@staticmethod
- def menu_func(cls, context):
+ def menu_func(cls, blender_context):
cls.layout.operator(
Ms3dImportOperator.bl_idname,
text=ms3d_str['TEXT_OPERATOR'],
@@ -462,16 +462,16 @@
##EXPORT_ACTIVE_ONLY:
##limit availability to only active mesh object
@classmethod
- def poll(cls, context):
- return (context
- and context.active_object
- and context.active_object.type in {'MESH', }
- and context.active_object.data
- and context.active_object.data.ms3d is not None
+ def poll(cls, blender_context):
+ return (blender_context
+ and blender_context.active_object
+ and blender_context.active_object.type in {'MESH', }
+ and blender_context.active_object.data
+ and blender_context.active_object.data.ms3d is not None
)
# draw the option panel
- def draw(self, context):
+ def draw(self, blender_context):
layout = self.layout
box = layout.box()
@@ -483,7 +483,7 @@
icon=Ms3dUi.ICON_PROCESSING)
row = box.row()
row.label(ms3d_str['PROP_NAME_ACTIVE'], icon='ROTACTIVE')
- row.label(context.active_object.name)
+ row.label(blender_context.active_object.name)
#box.prop(self, 'use_blender_names', icon='LINK_BLEND')
box.prop(self, 'use_blender_names')
box.prop(self, 'use_blender_materials')
@@ -517,7 +517,7 @@
return {"RUNNING_MODAL", }
@staticmethod
- def menu_func(cls, context):
+ def menu_func(cls, blender_context):
cls.layout.operator(
Ms3dExportOperator.bl_idname,
text=ms3d_str['TEXT_OPERATOR']
@@ -541,19 +541,19 @@
)
@classmethod
- def poll(cls, context):
- return (context
- and context.object
- and context.object.type in {'MESH', }
- and context.object.data
- and context.object.data.ms3d is not None
- and context.mode == 'EDIT_MESH'
- and context.tool_settings.mesh_select_mode[2]
+ def poll(cls, blender_context):
+ return (blender_context
+ and blender_context.object
+ and blender_context.object.type in {'MESH', }
+ and blender_context.object.data
+ and blender_context.object.data.ms3d is not None
+ and blender_context.mode == 'EDIT_MESH'
+ and blender_context.tool_settings.mesh_select_mode[2]
)
- def execute(self, context):
- custom_data = context.object.data.ms3d
- blender_mesh = context.object.data
+ def execute(self, blender_context):
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list