changed default nan_definitions.mk to use python 2.5 for linux (ai64 default was...
authorCampbell Barton <ideasman42@gmail.com>
Sun, 21 Oct 2007 17:38:17 +0000 (17:38 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 21 Oct 2007 17:38:17 +0000 (17:38 +0000)
pose.c - left a print here
export obj would ask about file overwriting twice.

release/scripts/export_obj.py
source/blender/python/api2_2x/Pose.c
source/nan_definitions.mk

index ded29af1924f41a043f33d691b4be16358f25df9..101a1ab1e84d10849a75561da320a7ca4d37b6aa 100644 (file)
@@ -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)
        
index 2f1eb0252a4d20eebcc24e4f0913d69f51cf4e5e..a67edd5dff42524d91fcf8afda3fe398512b4dab 100644 (file)
@@ -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)
index f1248b86bf91f6a03017e5cadf92d1eea0bfee9f..7fa3eb98e00ccf844db809668099ebf214906c4b 100644 (file)
@@ -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