diff options
author | Diego Borghetti <bdiego@gmail.com> | 2007-09-12 18:28:46 +0400 |
---|---|---|
committer | Diego Borghetti <bdiego@gmail.com> | 2007-09-12 18:28:46 +0400 |
commit | 758a5a10e3a088eed05ebacf4e527b6c626a532f (patch) | |
tree | 6be8d6739d5c9d949955c8718a61bf1882c866ba | |
parent | 58ba2f8f1c4b07820f0659f4d9681c726f76cada (diff) |
branches/2-44-stablev2.45
Merge from trunk:
revision 12001
revision 12003
revision 12006
-rw-r--r-- | intern/moto/include/MT_Vector3.h | 1 | ||||
-rw-r--r-- | intern/moto/include/MT_Vector4.h | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/scene.c | 2 | ||||
-rw-r--r-- | source/blender/src/multires.c | 2 |
4 files changed, 5 insertions, 1 deletions
diff --git a/intern/moto/include/MT_Vector3.h b/intern/moto/include/MT_Vector3.h index 41291e915be..c35a9d47234 100644 --- a/intern/moto/include/MT_Vector3.h +++ b/intern/moto/include/MT_Vector3.h @@ -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) {} diff --git a/intern/moto/include/MT_Vector4.h b/intern/moto/include/MT_Vector4.h index fa91abf2a84..5f1ee99d584 100644 --- a/intern/moto/include/MT_Vector4.h +++ b/intern/moto/include/MT_Vector4.h @@ -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) {} diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 42a61fb5f11..ea4911906bd 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -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; diff --git a/source/blender/src/multires.c b/source/blender/src/multires.c index 6af35a58f32..727ca37e753 100644 --- a/source/blender/src/multires.c +++ b/source/blender/src/multires.c @@ -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); |