[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12025] branches/2-44-stable/blender: branches/2-44-stable

[Diego Borghetti (Plumiferos)]

Revision: 12025
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12025
Author:   bdiego
Date:     2007-09-12 16:28:46 +0200 (Wed, 12 Sep 2007)

Log Message:
-----------
branches/2-44-stable

Merge from trunk:
	revision 12001
	revision 12003
	revision 12006

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12001
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12003
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12006

Modified Paths:
--------------
    branches/2-44-stable/blender/intern/moto/include/MT_Vector3.h
    branches/2-44-stable/blender/intern/moto/include/MT_Vector4.h
    branches/2-44-stable/blender/source/blender/blenkernel/intern/scene.c
    branches/2-44-stable/blender/source/blender/src/multires.c

Modified: branches/2-44-stable/blender/intern/moto/include/MT_Vector3.h
===================================================================
--- branches/2-44-stable/blender/intern/moto/include/MT_Vector3.h	2007-09-12 10:35:48 UTC (rev 12024)
+++ branches/2-44-stable/blender/intern/moto/include/MT_Vector3.h	2007-09-12 14:28:46 UTC (rev 12025)
@@ -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/2-44-stable/blender/intern/moto/include/MT_Vector4.h
===================================================================
--- branches/2-44-stable/blender/intern/moto/include/MT_Vector4.h	2007-09-12 10:35:48 UTC (rev 12024)
+++ branches/2-44-stable/blender/intern/moto/include/MT_Vector4.h	2007-09-12 14:28:46 UTC (rev 12025)
@@ -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/2-44-stable/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/2-44-stable/blender/source/blender/blenkernel/intern/scene.c	2007-09-12 10:35:48 UTC (rev 12024)
+++ branches/2-44-stable/blender/source/blender/blenkernel/intern/scene.c	2007-09-12 14:28:46 UTC (rev 12025)
@@ -197,6 +197,7 @@
 	sce->r.images= 100;
 	sce->r.framelen= 1.0;
 	sce->r.frs_sec= 25;
+	sce->r.ocres = 128;
 	
 	sce->r.bake_mode= 1;	/* prevent to include render stuff here */
 	sce->r.bake_filter= 2;
@@ -229,6 +230,7 @@
 	sce->toolsettings->uvcalc_mapalign = 1;
 	sce->toolsettings->unwrapper = 1;
 	sce->toolsettings->select_thresh= 0.01f;
+	sce->toolsettings->jointrilimit = 0.8f;
 	
 	sce->jumpframe = 10;
 	sce->audio.mixrate = 44100;

Modified: branches/2-44-stable/blender/source/blender/src/multires.c
===================================================================
--- branches/2-44-stable/blender/source/blender/src/multires.c	2007-09-12 10:35:48 UTC (rev 12024)
+++ branches/2-44-stable/blender/source/blender/src/multires.c	2007-09-12 14:28:46 UTC (rev 12025)
@@ -1078,7 +1078,7 @@
 		/* Remove editmesh elements */
 		free_editMesh(em);
 		
-		eves= MEM_callocN(sizeof(EditVert)*lvl->totvert, "editvert pointers");
+		eves= MEM_callocN(sizeof(EditVert*)*lvl->totvert, "editvert pointers");
 	} else {
 		CustomData_free_layer_active(&me->vdata, CD_MVERT, me->totvert);
 		CustomData_free_layer_active(&me->edata, CD_MEDGE, me->totedge);