[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12329] trunk/blender: changed default nan_definitions.mk to use python 2.5 for linux ( ai64 default was py 2.2 which probably wont even compile anymore)

[Campbell Barton]

Revision: 12329
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12329
Author:   campbellbarton
Date:     2007-10-21 19:38:17 +0200 (Sun, 21 Oct 2007)

Log Message:
-----------
changed default nan_definitions.mk to use python 2.5 for linux (ai64 default was py 2.2 which probably wont even compile anymore)
pose.c - left a print here
export obj would ask about file overwriting twice.

Modified Paths:
--------------
    trunk/blender/release/scripts/export_obj.py
    trunk/blender/source/blender/python/api2_2x/Pose.c
    trunk/blender/source/nan_definitions.mk

Modified: trunk/blender/release/scripts/export_obj.py
===================================================================
--- trunk/blender/release/scripts/export_obj.py	2007-10-21 17:20:31 UTC (rev 12328)
+++ trunk/blender/release/scripts/export_obj.py	2007-10-21 17:38:17 UTC (rev 12329)
@@ -629,14 +629,14 @@
 			
 			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)
 	

Modified: trunk/blender/source/blender/python/api2_2x/Pose.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Pose.c	2007-10-21 17:20:31 UTC (rev 12328)
+++ trunk/blender/source/blender/python/api2_2x/Pose.c	2007-10-21 17:38:17 UTC (rev 12329)
@@ -723,7 +723,6 @@
 //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)

Modified: trunk/blender/source/nan_definitions.mk
===================================================================
--- trunk/blender/source/nan_definitions.mk	2007-10-21 17:20:31 UTC (rev 12328)
+++ trunk/blender/source/nan_definitions.mk	2007-10-21 17:38:17 UTC (rev 12329)
@@ -356,11 +356,7 @@
     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