blender
/
blender
129
397
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

branches/2-44-stable 

Merge from trunk:
	revision 12001
	revision 12003
	revision 12006
This commit is contained in:
Diego Borghetti 2007-09-12 14:28:46 +00:00
parent 58ba2f8f1c
commit 758a5a10e3
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
intern/moto/include/MT_Vector3.h
View File

@ -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) {}

1
intern/moto/include/MT_Vector4.h
View File

@ -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) {}

2
source/blender/blenkernel/intern/scene.c
View File

@ -197,6 +197,7 @@ Scene *add_scene(char *name)
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 @@ Scene *add_scene(char *name)
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;

2
source/blender/src/multires.c
View File

@ -1078,7 +1078,7 @@ void multires_level_to_mesh(Object *ob, Mesh *me, const int render)
/* 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);