Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2009-11-11 21:46:55 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2009-11-11 21:46:55 +0300
commit5b9768d4090ace4b47c775bc5ad00d632f46a567 (patch)
treefb779665dac1865d985ea4ed166d5423992f8d40 /source/blender/editors/mesh/editmesh_tools.c
parentc5b89a2b7a249535ddca184528eca6b2aba906fa (diff)
Fix tris to quads not working, operator still needs to get properties,
but at least now executes with the defaults.
Diffstat (limited to 'source/blender/editors/mesh/editmesh_tools.c')
-rw-r--r--source/blender/editors/mesh/editmesh_tools.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index c59fb01ec99..8f2a09866f3 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -3259,7 +3259,7 @@ void join_triangles(EditMesh *em)
EVPtr *efaa = NULL;
float *creases = NULL;
float measure; /*Used to set tolerance*/
- float limit = 0.0f; // XXX scene->toolsettings->jointrilimit;
+ float limit = 0.8f; // XXX scene->toolsettings->jointrilimit;
int i, ok, totedge=0, totseledge=0, complexedges, vindex[4];
/*if we take a long time on very dense meshes we want waitcursor to display*/