[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12021] branches/nurbs/blender: Updating branch to current head, as that is what my local changes are synched to.
Emmanuel Stone
emmanuel.stone at gmail.com
Wed Sep 12 07:32:57 CEST 2007
Revision: 12021
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12021
Author: eman
Date: 2007-09-12 07:32:57 +0200 (Wed, 12 Sep 2007)
Log Message:
-----------
Updating branch to current head, as that is what my local changes are synched to.
"svn merge -r 11984:12020 https://svn.blender.org/svnroot/bf-blender/trunk/blender"
Modified Paths:
--------------
branches/nurbs/blender/intern/elbeem/intern/elbeem.h
branches/nurbs/blender/intern/elbeem/intern/ntl_geometryobject.cpp
branches/nurbs/blender/intern/elbeem/intern/ntl_vector3dim.h
branches/nurbs/blender/intern/elbeem/intern/parametrizer.cpp
branches/nurbs/blender/intern/elbeem/intern/solver_interface.cpp
branches/nurbs/blender/intern/elbeem/intern/utilities.cpp
branches/nurbs/blender/intern/elbeem/intern/utilities.h
branches/nurbs/blender/intern/moto/include/MT_Vector3.h
branches/nurbs/blender/intern/moto/include/MT_Vector4.h
branches/nurbs/blender/intern/moto/include/MT_assert.h
branches/nurbs/blender/intern/moto/intern/MT_Assert.cpp
branches/nurbs/blender/release/datafiles/splash.jpg
branches/nurbs/blender/release/scripts/console.py
branches/nurbs/blender/release/scripts/import_dxf.py
branches/nurbs/blender/source/blender/blenkernel/BKE_blender.h
branches/nurbs/blender/source/blender/blenkernel/BKE_customdata.h
branches/nurbs/blender/source/blender/blenkernel/BKE_global.h
branches/nurbs/blender/source/blender/blenkernel/BKE_mesh.h
branches/nurbs/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/nurbs/blender/source/blender/blenkernel/intern/customdata.c
branches/nurbs/blender/source/blender/blenkernel/intern/mesh.c
branches/nurbs/blender/source/blender/blenkernel/intern/modifier.c
branches/nurbs/blender/source/blender/blenkernel/intern/scene.c
branches/nurbs/blender/source/blender/include/BDR_editface.h
branches/nurbs/blender/source/blender/include/BIF_editmesh.h
branches/nurbs/blender/source/blender/include/BIF_editsima.h
branches/nurbs/blender/source/blender/include/editmesh.h
branches/nurbs/blender/source/blender/python/api2_2x/Mesh.c
branches/nurbs/blender/source/blender/render/intern/source/convertblender.c
branches/nurbs/blender/source/blender/render/intern/source/rayshade.c
branches/nurbs/blender/source/blender/src/buttons_editing.c
branches/nurbs/blender/source/blender/src/buttons_shading.c
branches/nurbs/blender/source/blender/src/drawimage.c
branches/nurbs/blender/source/blender/src/drawipo.c
branches/nurbs/blender/source/blender/src/drawmesh.c
branches/nurbs/blender/source/blender/src/drawobject.c
branches/nurbs/blender/source/blender/src/drawscene.c
branches/nurbs/blender/source/blender/src/drawview.c
branches/nurbs/blender/source/blender/src/edit.c
branches/nurbs/blender/source/blender/src/editaction.c
branches/nurbs/blender/source/blender/src/editarmature.c
branches/nurbs/blender/source/blender/src/editface.c
branches/nurbs/blender/source/blender/src/editipo.c
branches/nurbs/blender/source/blender/src/editmesh.c
branches/nurbs/blender/source/blender/src/editmesh_add.c
branches/nurbs/blender/source/blender/src/editmesh_lib.c
branches/nurbs/blender/source/blender/src/editmesh_mods.c
branches/nurbs/blender/source/blender/src/editmesh_tools.c
branches/nurbs/blender/source/blender/src/editobject.c
branches/nurbs/blender/source/blender/src/editscreen.c
branches/nurbs/blender/source/blender/src/editsima.c
branches/nurbs/blender/source/blender/src/editview.c
branches/nurbs/blender/source/blender/src/header_image.c
branches/nurbs/blender/source/blender/src/header_info.c
branches/nurbs/blender/source/blender/src/header_view3d.c
branches/nurbs/blender/source/blender/src/multires.c
branches/nurbs/blender/source/blender/src/outliner.c
branches/nurbs/blender/source/blender/src/poseobject.c
branches/nurbs/blender/source/blender/src/space.c
branches/nurbs/blender/source/blender/src/splash.jpg.c
branches/nurbs/blender/source/blender/src/toolbox.c
branches/nurbs/blender/source/blender/src/transform_conversions.c
branches/nurbs/blender/source/blender/src/transform_generics.c
branches/nurbs/blender/source/blender/src/transform_manipulator.c
branches/nurbs/blender/source/blender/src/unwrapper.c
branches/nurbs/blender/source/blender/src/view.c
branches/nurbs/blender/source/blender/src/vpaint.c
Modified: branches/nurbs/blender/intern/elbeem/intern/elbeem.h
===================================================================
--- branches/nurbs/blender/intern/elbeem/intern/elbeem.h 2007-09-12 05:13:59 UTC (rev 12020)
+++ branches/nurbs/blender/intern/elbeem/intern/elbeem.h 2007-09-12 05:32:57 UTC (rev 12021)
@@ -154,7 +154,7 @@
short volumeInitType;
/* name of the mesh, mostly for debugging */
- char *name;
+ const char *name;
} elbeemMesh;
// API functions
Modified: branches/nurbs/blender/intern/elbeem/intern/ntl_geometryobject.cpp
===================================================================
--- branches/nurbs/blender/intern/elbeem/intern/ntl_geometryobject.cpp 2007-09-12 05:13:59 UTC (rev 12020)
+++ branches/nurbs/blender/intern/elbeem/intern/ntl_geometryobject.cpp 2007-09-12 05:32:57 UTC (rev 12021)
@@ -83,7 +83,7 @@
/* Init attributes etc. of this object */
/*****************************************************************************/
#define GEOINIT_STRINGS 9
-static char *initStringStrs[GEOINIT_STRINGS] = {
+static const char *initStringStrs[GEOINIT_STRINGS] = {
"fluid",
"bnd_no","bnd_noslip",
"bnd_free","bnd_freeslip",
Modified: branches/nurbs/blender/intern/elbeem/intern/ntl_vector3dim.h
===================================================================
--- branches/nurbs/blender/intern/elbeem/intern/ntl_vector3dim.h 2007-09-12 05:13:59 UTC (rev 12020)
+++ branches/nurbs/blender/intern/elbeem/intern/ntl_vector3dim.h 2007-09-12 05:32:57 UTC (rev 12021)
@@ -202,7 +202,7 @@
//! global string for formatting vector output in utilities.cpp
-extern char *globVecFormatStr;
+extern const char *globVecFormatStr;
/*************************************************************************
Outputs the object in human readable form using the format
Modified: branches/nurbs/blender/intern/elbeem/intern/parametrizer.cpp
===================================================================
--- branches/nurbs/blender/intern/elbeem/intern/parametrizer.cpp 2007-09-12 05:13:59 UTC (rev 12020)
+++ branches/nurbs/blender/intern/elbeem/intern/parametrizer.cpp 2007-09-12 05:32:57 UTC (rev 12021)
@@ -14,7 +14,7 @@
#define DEBUG_PARAMCHANNELS 0
/*! param seen debug string array */
-char *ParamStrings[] = {
+const char *ParamStrings[] = {
"RelaxTime",
"Reynolds",
"Viscosity",
Modified: branches/nurbs/blender/intern/elbeem/intern/solver_interface.cpp
===================================================================
--- branches/nurbs/blender/intern/elbeem/intern/solver_interface.cpp 2007-09-12 05:13:59 UTC (rev 12020)
+++ branches/nurbs/blender/intern/elbeem/intern/solver_interface.cpp 2007-09-12 05:32:57 UTC (rev 12021)
@@ -187,7 +187,7 @@
// cpdata init check missing...
double memd = memCnt;
- char *sizeStr = "";
+ const char *sizeStr = "";
const double sfac = 1024.0;
if(memd>sfac){ memd /= sfac; sizeStr="KB"; }
if(memd>sfac){ memd /= sfac; sizeStr="MB"; }
Modified: branches/nurbs/blender/intern/elbeem/intern/utilities.cpp
===================================================================
--- branches/nurbs/blender/intern/elbeem/intern/utilities.cpp 2007-09-12 05:13:59 UTC (rev 12020)
+++ branches/nurbs/blender/intern/elbeem/intern/utilities.cpp 2007-09-12 05:32:57 UTC (rev 12021)
@@ -56,7 +56,7 @@
char gElbeemErrorString[256] = {'-','\0' };
// access elbeem simulator error string
-void setElbeemErrorString(char* set) {
+void setElbeemErrorString(const char* set) {
strncpy(gElbeemErrorString, set, 256);
}
char* getElbeemErrorString(void) { return gElbeemErrorString; }
@@ -77,7 +77,7 @@
void resetGlobalColorSetting() { globalColorSetting = DEF_globalColorSetting; }
// global string for formatting vector output, TODO test!?
-char *globVecFormatStr = "V[%f,%f,%f]";
+const char *globVecFormatStr = "V[%f,%f,%f]";
// global mp on/off switch
Modified: branches/nurbs/blender/intern/elbeem/intern/utilities.h
===================================================================
--- branches/nurbs/blender/intern/elbeem/intern/utilities.h 2007-09-12 05:13:59 UTC (rev 12020)
+++ branches/nurbs/blender/intern/elbeem/intern/utilities.h 2007-09-12 05:32:57 UTC (rev 12021)
@@ -50,7 +50,7 @@
int isSimworldOk(void);
// access elbeem simulator error string
-void setElbeemErrorString(char* set);
+void setElbeemErrorString(const char* set);
char* getElbeemErrorString(void);
Modified: branches/nurbs/blender/intern/moto/include/MT_Vector3.h
===================================================================
--- branches/nurbs/blender/intern/moto/include/MT_Vector3.h 2007-09-12 05:13:59 UTC (rev 12020)
+++ branches/nurbs/blender/intern/moto/include/MT_Vector3.h 2007-09-12 05:32:57 UTC (rev 12021)
@@ -51,6 +51,7 @@
class MT_Vector3 : public MT_Tuple3 {
public:
+ virtual ~MT_Vector3() {}
MT_Vector3() {}
MT_Vector3(const float *v) : MT_Tuple3(v) {}
MT_Vector3(const double *v) : MT_Tuple3(v) {}
Modified: branches/nurbs/blender/intern/moto/include/MT_Vector4.h
===================================================================
--- branches/nurbs/blender/intern/moto/include/MT_Vector4.h 2007-09-12 05:13:59 UTC (rev 12020)
+++ branches/nurbs/blender/intern/moto/include/MT_Vector4.h 2007-09-12 05:32:57 UTC (rev 12021)
@@ -52,6 +52,7 @@
class MT_Vector4 : public MT_Tuple4 {
public:
+ virtual ~MT_Vector4() {}
MT_Vector4() {}
MT_Vector4(const float *v) : MT_Tuple4(v) {}
MT_Vector4(const double *v) : MT_Tuple4(v) {}
Modified: branches/nurbs/blender/intern/moto/include/MT_assert.h
===================================================================
--- branches/nurbs/blender/intern/moto/include/MT_assert.h 2007-09-12 05:13:59 UTC (rev 12020)
+++ branches/nurbs/blender/intern/moto/include/MT_assert.h 2007-09-12 05:32:57 UTC (rev 12021)
@@ -48,7 +48,7 @@
// file, line, predicate form the message to ask, *do_assert should be set
// to 0 to ignore.
// returns 1 to break, false to ignore
-MT_CDECL int MT_QueryAssert(char *file, int line, char *predicate, int *do_assert);
+MT_CDECL int MT_QueryAssert(const char *file, int line, const char *predicate, int *do_assert);
#ifdef NDEBUG
Modified: branches/nurbs/blender/intern/moto/intern/MT_Assert.cpp
===================================================================
--- branches/nurbs/blender/intern/moto/intern/MT_Assert.cpp 2007-09-12 05:13:59 UTC (rev 12020)
+++ branches/nurbs/blender/intern/moto/intern/MT_Assert.cpp 2007-09-12 05:32:57 UTC (rev 12021)
@@ -45,7 +45,7 @@
// Query the user if they want to break/abort the program, ignore the assert, or ignore all future
// occurance of the assert.
-int MT_QueryAssert(char *file, int line, char *predicate, int *do_assert)
+int MT_QueryAssert(const char *file, int line, const char *predicate, int *do_assert)
{
#ifdef _WIN32
if (*do_assert)
Modified: branches/nurbs/blender/release/datafiles/splash.jpg
===================================================================
(Binary files differ)
Modified: branches/nurbs/blender/release/scripts/console.py
===================================================================
--- branches/nurbs/blender/release/scripts/console.py 2007-09-12 05:13:59 UTC (rev 12020)
+++ branches/nurbs/blender/release/scripts/console.py 2007-09-12 05:32:57 UTC (rev 12021)
@@ -774,6 +774,7 @@
# Autoexec, startup code.
scriptDir = Get('scriptsdir')
+console_autoexec = None
if scriptDir:
if not scriptDir.endswith(Blender.sys.sep):
scriptDir += Blender.sys.sep
@@ -788,7 +789,10 @@
except:
cmdBuffer.append(cmdLine('...console_autoexec.py could not write, this is ok', 1, None))
scriptDir = None # make sure we only use this for console_autoexec.py
-
+
+ if not sys.exists(console_autoexec):
+ console_autoexec = None
+
else:
cmdBuffer.append(cmdLine('...Using existing console_autoexec.py in scripts dir', 1, None))
@@ -811,7 +815,7 @@
exec('%s%s' % ('__CONSOLE_VAR_DICT__["bpy"]=', 'bpy'))
-if scriptDir:
+if scriptDir and console_autoexec:
include_console(console_autoexec) # pass the blender module
#-end autoexec-----------------------------------------------------------------#
Modified: branches/nurbs/blender/release/scripts/import_dxf.py
===================================================================
--- branches/nurbs/blender/release/scripts/import_dxf.py 2007-09-12 05:13:59 UTC (rev 12020)
+++ branches/nurbs/blender/release/scripts/import_dxf.py 2007-09-12 05:32:57 UTC (rev 12021)
@@ -7,10 +7,10 @@
Tooltip: 'Import for DXF geometry data (Drawing eXchange Format).'
"""
__author__ = 'Kitsu(Ed Blake) & migius(Remigiusz Fiedler)'
-__version__ = '1.0.beta09 by migius 02.09.2007'
+__version__ = '1.0.beta10 - 2007.09.09 by migius'
__url__ = ["http://blenderartists.org/forum/showthread.php?t=84319",
"http://wiki.blender.org/index.php/Scripts/Manual/Import/DXF-3D"]
-__email__ = ["Kitsune_e(at)yahoo.com", "remi_(at)gmx.de"]
+__email__ = ["Kitsune_e(at)yahoo.com", "migius(at)4d-vectors.de"]
__bpydoc__ = """\
This script imports DXF objects (2d/3d) into Blender.
@@ -54,10 +54,8 @@
- Blocks are created on layer 19 then referenced at each insert point.
* Big DXF-files (over 1500 objects) decrease import performance. The problem is not the inefficiency of python-scripting but Blenders performance in creating new objects in his database - probably a database management problem.
* The Blender curves of imported ARCs and POLYLINE-arc-segments have light malformed ends.(to fix in beta10)
-- Bug in newScene-option: ARCs and CIRCLEs are drawn at (0,0,0). (wip)
TODO:
-- filtering of unused/not-inserted Blocks
- the new style object visibility
- support for Spline-curves, Besier-curves
- support for real 3d-solids (ACIS)
@@ -65,24 +63,28 @@
History:
- v1.0 08.2007 by migius: "full 3d"-release
- TODO:
- -- command-line-mode/batch-mode
+ v1.0 - 2007.09 by migius: "full 3d"-release
+ planned tasks:
+ -- filtering of unused/not-inserted BLOCKs
-- human-formating of data in INI-File
-- suport for MLine
-- suport for Ellipse
-- suport for Mtext
-- blender_object.ID.properties[dxf_layer_name]
- -- Configuration files(.ini) can handle various material setups
+ -- Configuration files(.ini) should/can handle various material setups
-- added f_layerFilter
- -- to-check: new_scene-idea from ideasman42: each import create a new scene
-- to-check: obj/mat/group/_mapping-idea from ideasman42:
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list