Merge of trunk into blender 2.5:

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416

Issues:
* GHOST/X11 had conflicting changes. Some code was added in 2.5, which was
  later added in trunk also, but reverted partially, specifically revision
  16683. I have left out this reversion in the 2.5 branch since I think it is
  needed there.
  http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683
* Scons had various conflicting changes, I decided to go with trunk version
  for everything except priorities and some library renaming.
* In creator.c, there were various fixes and fixes for fixes related to the -w
  -W and -p options. In 2.5 -w and -W is not coded yet, and -p is done
  differently. Since this is changed so much, and I don't think those fixes
  would be needed in 2.5, I've left them out.
* Also in creator.c: there was code for a python bugfix where the screen was not
  initialized when running with -P. The code that initializes the screen there
  I had to disable, that can't work in 2.5 anymore but left it commented as a
  reminder.

Further I had to disable some new function calls. using src/ and python/, as
was done already in this branch, disabled function calls:
* bpath.c: error reporting
* BME_conversions.c: editmesh conversion functions.
* SHD_dynamic: disabled almost completely, there is no python/.
* KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled.
* text.c: clipboard copy call.
* object.c: OB_SUPPORT_MATERIAL.
* DerivedMesh.c and subsurf_ccg, stipple_quarttone.

Still to be done:
* Go over files and functions that were moved to a different location but could
  still use changes that were done in trunk.

1 files changed, 2 insertions, 43 deletions

diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h
index a4fb8dc1150..f809cac037d 100644
--- a/source/blender/makesdna/DNA_curve_types.h
+++ b/source/blender/makesdna/DNA_curve_types.h
@@ -68,7 +68,7 @@ typedef struct BevList {
 #
 #
 typedef struct BevPoint {
-	float x, y, z, alfa, sina, cosa, mat[3][3];
+	float x, y, z, alfa, radius, sina, cosa, mat[3][3];
 	short f1, f2;
 } BevPoint;
 
@@ -115,7 +115,7 @@ typedef struct Nurb {
 	BezTriple *bezt;
 
 	short tilt_interp;	/* KEY_LINEAR, KEY_CARDINAL, KEY_BSPLINE */
-	short pad;
+	short radius_interp;
 	
 	int charidx;
 } Nurb;
@@ -187,37 +187,6 @@ typedef struct Curve {
 	struct CharInfo curinfo;	
 } Curve;
 
-typedef struct IpoDriver {
-	struct Object *ob;
-	short blocktype, adrcode, type, flag;
-	char name[128];	 /* bone or constraint(?), or python expression here */
-} IpoDriver;
-
-/* temp? we store more bone names in 1 driver... */
-#define DRIVER_NAME_OFFS	32
-
-typedef struct IpoCurve {
-	struct IpoCurve *next,  *prev;
-	
-	struct BPoint *bp;					/* are these even used anywhere? */
-	struct BezTriple *bezt;				/* array of BezTriples (sizeof(BezTriple)*totvert. i.e.  keyframes  */
-
-	rctf maxrct, totrct;				/* bounding boxes */
-
-	short blocktype, adrcode, vartype;	/* blocktype= ipo-blocktype; adrcode= type of ipo-curve; vartype= 'format' of data */
-	short totvert;						/* total number of BezTriples (i.e. keyframes) on curve */
-	short ipo, extrap;					/* interpolation and extrapolation modes  */
-	short flag, rt;						/* flag= settings; rt= ??? */
-	float ymin, ymax;					/* minimum/maximum y-extents for curve */
-	unsigned int bitmask;				/* ??? */
-	
-	float slide_min, slide_max;			/* minimum/maximum values for sliders (in action editor) */
-	float curval;						/* value of ipo-curve for current frame */
-	
-	IpoDriver *driver;					/* pointer to ipo-driver for this curve */
-	
-} IpoCurve;
-
 /* **************** CURVE ********************* */
 
 /* texflag */
@@ -273,15 +242,5 @@ typedef struct IpoCurve {
 #define CU_UNDERLINE	4
 #define CU_WRAP			8	/* wordwrap occured here */
 
-/* *************** driver ****************** */
-
-/* driver->type */
-#define	IPO_DRIVER_TYPE_NORMAL 0
-#define	IPO_DRIVER_TYPE_PYTHON 1
-
-/* driver->flag */
-/* invalid flag: currently only used for buggy pydriver expressions: */
-#define IPO_DRIVER_FLAG_INVALID 1
-
 #endif