[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29333] branches/soc-2010-rohith291991: something went really wrong with some commit.

[Rohith B V]

Revision: 29333
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29333
Author:   rohith291991
Date:     2010-06-08 12:24:10 +0200 (Tue, 08 Jun 2010)

Log Message:
-----------
something went really wrong with some commit. trying to fix issue

Modified Paths:
--------------
    branches/soc-2010-rohith291991/intern/SConscript
    branches/soc-2010-rohith291991/source/blender/modifiers/SConscript
    branches/soc-2010-rohith291991/source/blender/modifiers/intern/MOD_quadrangulate.c

Removed Paths:
-------------
    branches/soc-2010-rohith291991/intern/comiso/

Modified: branches/soc-2010-rohith291991/intern/SConscript
===================================================================
--- branches/soc-2010-rohith291991/intern/SConscript	2010-06-08 07:47:03 UTC (rev 29332)
+++ branches/soc-2010-rohith291991/intern/SConscript	2010-06-08 10:24:10 UTC (rev 29333)
@@ -13,8 +13,7 @@
             'itasc/SConscript',
             'boolop/SConscript',
             'opennl/SConscript',
-            'smoke/SConscript',
-            'comiso/SConscript'])
+            'smoke/SConscript'])
 
 # NEW_CSG was intended for intern/csg, but
 # getting it to compile is difficult

Modified: branches/soc-2010-rohith291991/source/blender/modifiers/SConscript
===================================================================
--- branches/soc-2010-rohith291991/source/blender/modifiers/SConscript	2010-06-08 07:47:03 UTC (rev 29332)
+++ branches/soc-2010-rohith291991/source/blender/modifiers/SConscript	2010-06-08 10:24:10 UTC (rev 29333)
@@ -4,7 +4,7 @@
 sources = env.Glob('intern/*.c')
 
 incs = '. ./intern'
-incs += ' #/intern/guardedalloc #/intern/decimation/extern #/intern/bsp/extern #/intern/elbeem/extern'
+incs += ' #/intern/guardedalloc #/intern/decimation/extern #/intern/bsp/extern #/intern/elbeem/extern #/intern/comiso/extern'
 incs += ' ../render/extern/include'
 incs += ' ../include ../blenlib ../makesdna ../blenkernel ../blenkernel/intern'
 

Modified: branches/soc-2010-rohith291991/source/blender/modifiers/intern/MOD_quadrangulate.c
===================================================================
--- branches/soc-2010-rohith291991/source/blender/modifiers/intern/MOD_quadrangulate.c	2010-06-08 07:47:03 UTC (rev 29332)
+++ branches/soc-2010-rohith291991/source/blender/modifiers/intern/MOD_quadrangulate.c	2010-06-08 10:24:10 UTC (rev 29333)
@@ -25,7 +25,7 @@
 */
 
 #include "DNA_meshdata_types.h"
-
+#include "comiso.h"
 #include "BLI_math.h"
 
 #include "BKE_cdderivedmesh.h"
@@ -59,7 +59,12 @@
 	ModifierData *md, Object *ob, DerivedMesh *derivedData,
   int useRenderParams, int isFinalCalc)
 {
-	
+
+
+//printf("ASFASFAFFADSFSDG\n");
+    
+    /*
+    
 	QuadrangulateModifierData *dmd = (QuadrangulateModifierData*) md;
 	DerivedMesh *dm = derivedData, *result = NULL;
 	MVert *mvert;
@@ -77,6 +82,7 @@
 	//------Test code-----//
 
 	numTris = 0;
+
 	for (a=0; a<totface; a++) 
 	{
 		MFace *mf = &mface[a];
@@ -94,8 +100,11 @@
 		modifier_setError(md,"Modifier requires **condition**.");
 		return result;
 	}
+*/
+    
 
-	return result;
+	MyFunc();
+	return NULL;
 }