[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30034] branches/soc-2010-jwilkins: more merge fixes
Jason Wilkins
Jason.A.Wilkins at gmail.com
Tue Jul 6 14:32:09 CEST 2010
Revision: 30034
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30034
Author: jwilkins
Date: 2010-07-06 14:32:09 +0200 (Tue, 06 Jul 2010)
Log Message:
-----------
more merge fixes
Modified Paths:
--------------
branches/soc-2010-jwilkins/intern/ghost/GHOST_Path-api.h
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_Path-api.cpp
branches/soc-2010-jwilkins/release/scripts/io/export_3ds.py
branches/soc-2010-jwilkins/release/scripts/io/import_scene_3ds.py
branches/soc-2010-jwilkins/release/scripts/op/object.py
branches/soc-2010-jwilkins/release/scripts/op/object_align.py
branches/soc-2010-jwilkins/release/scripts/op/uvcalc_smart_project.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_curve.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_object.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_object_constraint.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_physics_cloth.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_physics_common.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_render.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_scene.py
branches/soc-2010-jwilkins/release/scripts/ui/space_sequencer.py
branches/soc-2010-jwilkins/release/scripts/ui/space_userpref_keymap.py
branches/soc-2010-jwilkins/release/scripts/ui/space_view3d.py
Property Changed:
----------------
branches/soc-2010-jwilkins/intern/ghost/GHOST_Path-api.h
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_Path-api.cpp
branches/soc-2010-jwilkins/release/scripts/ui/properties_object.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_physics_cloth.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_render.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_scene.py
Modified: branches/soc-2010-jwilkins/intern/ghost/GHOST_Path-api.h
===================================================================
--- branches/soc-2010-jwilkins/intern/ghost/GHOST_Path-api.h 2010-07-06 11:51:12 UTC (rev 30033)
+++ branches/soc-2010-jwilkins/intern/ghost/GHOST_Path-api.h 2010-07-06 12:32:09 UTC (rev 30034)
@@ -1,63 +1,63 @@
-/**
- * $Id: GHOST_Path-api.h 30004 2010-07-05 19:59:37Z damien78 $
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2010 by Blender Foundation.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef GHOST_PATH_API_H
-#define GHOST_PATH_API_H
-
-#include "GHOST_Types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Determine the base dir in which shared resources are located. It will first try to use
- * "unpack and run" path, then look for properly installed path, not including versioning.
- * @return Unsigned char string pointing to system dir (eg /usr/share/blender/).
- */
-extern const GHOST_TUns8* GHOST_getSystemDir();
-
-/**
- * Determine the base dir in which user configuration is stored, not including versioning.
- * @return Unsigned char string pointing to user dir (eg ~).
- */
-extern const GHOST_TUns8* GHOST_getUserDir();
-
-
-/**
- * Determine the dir in which the binary file is found.
- * @return Unsigned char string pointing to binary dir (eg ~/usr/local/bin/).
- */
-extern const GHOST_TUns8* GHOST_getBinaryDir();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
+/**
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2010 by Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef GHOST_PATH_API_H
+#define GHOST_PATH_API_H
+
+#include "GHOST_Types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Determine the base dir in which shared resources are located. It will first try to use
+ * "unpack and run" path, then look for properly installed path, not including versioning.
+ * @return Unsigned char string pointing to system dir (eg /usr/share/blender/).
+ */
+extern const GHOST_TUns8* GHOST_getSystemDir();
+
+/**
+ * Determine the base dir in which user configuration is stored, not including versioning.
+ * @return Unsigned char string pointing to user dir (eg ~).
+ */
+extern const GHOST_TUns8* GHOST_getUserDir();
+
+
+/**
+ * Determine the dir in which the binary file is found.
+ * @return Unsigned char string pointing to binary dir (eg ~/usr/local/bin/).
+ */
+extern const GHOST_TUns8* GHOST_getBinaryDir();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
Property changes on: branches/soc-2010-jwilkins/intern/ghost/GHOST_Path-api.h
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Modified: branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_Path-api.cpp
===================================================================
--- branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_Path-api.cpp 2010-07-06 11:51:12 UTC (rev 30033)
+++ branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_Path-api.cpp 2010-07-06 12:32:09 UTC (rev 30034)
@@ -1,50 +1,50 @@
-/**
- * $Id: GHOST_Path-api.cpp 29954 2010-07-05 00:00:40Z campbellbarton $
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2010 by Blender Foundation.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#include "intern/GHOST_Debug.h"
-#include "GHOST_Path-api.h"
-#include "GHOST_ISystem.h"
-
-const GHOST_TUns8* GHOST_getSystemDir()
-{
- GHOST_ISystem* system = GHOST_ISystem::getSystem();
- return system ? system->getSystemDir() : NULL;
-}
-
-const GHOST_TUns8* GHOST_getUserDir()
-{
- GHOST_ISystem* system = GHOST_ISystem::getSystem();
- return system ? system->getUserDir() : NULL; /* will be NULL in background mode */
-}
-
-const GHOST_TUns8* GHOST_getBinaryDir()
-{
- GHOST_ISystem* system = GHOST_ISystem::getSystem();
- return system ? system->getBinaryDir() : NULL; /* will be NULL in background mode */
-}
+/**
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2010 by Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include "intern/GHOST_Debug.h"
+#include "GHOST_Path-api.h"
+#include "GHOST_ISystem.h"
+
+const GHOST_TUns8* GHOST_getSystemDir()
+{
+ GHOST_ISystem* system = GHOST_ISystem::getSystem();
+ return system ? system->getSystemDir() : NULL;
+}
+
+const GHOST_TUns8* GHOST_getUserDir()
+{
+ GHOST_ISystem* system = GHOST_ISystem::getSystem();
+ return system ? system->getUserDir() : NULL; /* will be NULL in background mode */
+}
+
+const GHOST_TUns8* GHOST_getBinaryDir()
+{
+ GHOST_ISystem* system = GHOST_ISystem::getSystem();
+ return system ? system->getBinaryDir() : NULL; /* will be NULL in background mode */
+}
Property changes on: branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_Path-api.cpp
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Modified: branches/soc-2010-jwilkins/release/scripts/io/export_3ds.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/io/export_3ds.py 2010-07-06 11:51:12 UTC (rev 30033)
+++ branches/soc-2010-jwilkins/release/scripts/io/export_3ds.py 2010-07-06 12:32:09 UTC (rev 30034)
@@ -63,6 +63,8 @@
import time
import bpy
+import os
+import time
# import Blender
# from BPyMesh import getMeshFromObject
@@ -1122,7 +1124,6 @@
# to the class instance from the operator settings before calling.
- # filename = StringProperty(name="File Name", description="File name used for exporting the 3DS file", maxlen= 1024, default= ""),
filepath = StringProperty(name="File Path", description="Filepath used for exporting the 3DS file", maxlen= 1024, default= "")
check_existing = BoolProperty(name="Check Existing", description="Check and warn on overwriting existing files", default=True, options={'HIDDEN'})
Modified: branches/soc-2010-jwilkins/release/scripts/io/import_scene_3ds.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/io/import_scene_3ds.py 2010-07-06 11:51:12 UTC (rev 30033)
+++ branches/soc-2010-jwilkins/release/scripts/io/import_scene_3ds.py 2010-07-06 12:32:09 UTC (rev 30034)
@@ -273,6 +273,13 @@
return s
# return s[:-1]
+ s = str(s[:-1], 'ASCII')
+# print("read string", s)
+
+ #remove the null character from the string
+ return s
+# return s[:-1]
+
######################################################
# IMPORT
######################################################
@@ -1011,8 +1018,6 @@
# to the class instance from the operator settings before calling.
filepath = StringProperty(name="File Path", description="Filepath used for importing the 3DS file", maxlen= 1024, default= "")
- filename = StringProperty(name="File Name", description="Name of the file.")
- directory = StringProperty(name="Directory", description="Directory of the file.")
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list