diff options
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 2 | ||||
| -rw-r--r-- | source/blender/src/multires.c | 2 |
2 files changed, 3 insertions, 1 deletions
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); |