diff options
| -rw-r--r-- | release/scripts/export_obj.py | 16 | ||||
| -rw-r--r-- | source/blender/python/api2_2x/Pose.c | 1 | ||||
| -rw-r--r-- | source/nan_definitions.mk | 6 |
3 files changed, 9 insertions, 14 deletions
diff --git a/release/scripts/export_obj.py b/release/scripts/export_obj.py index ded29af1924..101a1ab1e84 100644 --- a/release/scripts/export_obj.py +++ b/release/scripts/export_obj.py @@ -629,14 +629,14 @@ def write_ui(filename): full_path= ''.join(context_name) - if BPyMessages.Warning_SaveOver(full_path): - # EXPORT THE FILE. - write(full_path, export_objects,\ - EXPORT_TRI, EXPORT_EDGES, EXPORT_NORMALS,\ - EXPORT_NORMALS_HQ, EXPORT_UV, EXPORT_MTL,\ - EXPORT_COPY_IMAGES, EXPORT_APPLY_MODIFIERS,\ - EXPORT_ROTX90, EXPORT_BLEN_OBS,\ - EXPORT_GROUP_BY_OB, EXPORT_GROUP_BY_MAT, EXPORT_MORPH_TARGET) + # erm... bit of a problem here, this can overwrite files when exporting frames. not too bad. + # EXPORT THE FILE. + write(full_path, export_objects,\ + EXPORT_TRI, EXPORT_EDGES, EXPORT_NORMALS,\ + EXPORT_NORMALS_HQ, EXPORT_UV, EXPORT_MTL,\ + EXPORT_COPY_IMAGES, EXPORT_APPLY_MODIFIERS,\ + EXPORT_ROTX90, EXPORT_BLEN_OBS,\ + EXPORT_GROUP_BY_OB, EXPORT_GROUP_BY_MAT, EXPORT_MORPH_TARGET) Blender.Set('curframe', orig_frame) diff --git a/source/blender/python/api2_2x/Pose.c b/source/blender/python/api2_2x/Pose.c index 2f1eb0252a4..a67edd5dff4 100644 --- a/source/blender/python/api2_2x/Pose.c +++ b/source/blender/python/api2_2x/Pose.c @@ -723,7 +723,6 @@ AttributeError: //Gets the pose_mat static PyObject *PoseBone_getPoseMatrix(BPy_PoseBone *self, void *closure) { - printmatrix4("posemat GET", self->posechannel->pose_mat ); return newMatrixObject((float*)self->posechannel->pose_mat, 4, 4, Py_WRAP); } //------------------------PoseBone.poseMatrix (setter) diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index f1248b86bf9..7fa3eb98e00 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -356,11 +356,7 @@ endif export FREEDESKTOP ?= true export NAN_PYTHON ?= /usr - ifeq ($(CPU),ia64) - export NAN_PYTHON_VERSION ?= 2.2 - else - export NAN_PYTHON_VERSION ?= 2.3 - endif + export NAN_PYTHON_VERSION ?= 2.5 export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION) export NAN_OPENAL ?= /usr export NAN_FMOD ?= $(LCGDIR)/fmod |