[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19332] trunk/blender/source/blender/src/ editmesh_tools.c: patch from Banlu Kemiyatorn

Campbell Barton ideasman42 at gmail.com
Fri Mar 20 03:26:04 CET 2009


Revision: 19332
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19332
Author:   campbellbarton
Date:     2009-03-20 03:26:02 +0100 (Fri, 20 Mar 2009)

Log Message:
-----------
patch from Banlu Kemiyatorn
* when joining only 2 faces dont check they are convex
* allow edge rotate for non planer faces
- Both were very annoying especially when sub-surf modeling with edge loops

Modified Paths:
--------------
    trunk/blender/source/blender/src/editmesh_tools.c

Modified: trunk/blender/source/blender/src/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/src/editmesh_tools.c	2009-03-19 19:03:38 UTC (rev 19331)
+++ trunk/blender/source/blender/src/editmesh_tools.c	2009-03-20 02:26:02 UTC (rev 19332)
@@ -3352,11 +3352,9 @@
 				if(v1 && v2 && v3 && v4){
 					/*test if simple island first. This mimics 2.42 behaviour and the tests are less restrictive.*/
 					if(efaa[0]->tmp.l == 1 && efaa[1]->tmp.l == 1){
-						if( convex(v1->co, v2->co, v3->co, v4->co) ){ 
-							eed->f1 |= T2QJOIN;
-							efaa[0]->f1 = 1; //mark for join
-							efaa[1]->f1 = 1; //mark for join
-						}
+						eed->f1 |= T2QJOIN;
+						efaa[0]->f1 = 1; //mark for join
+						efaa[1]->f1 = 1; //mark for join
 					}
 					else{ 
 						
@@ -3615,10 +3613,6 @@
 	if(numshared > 1)
 		return;
 	
-	/* coplaner faces only please */
-	if(Inpf(face[0]->n,face[1]->n) <= 0.000001)
-		return;
-	
 	/* we want to construct an array of vertex indicis in both faces, starting at
 	   the last vertex of the edge being rotated.
 	   - first we find the two vertices that lie on the rotating edge





More information about the Bf-blender-cvs mailing list