[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14501] branches/apricot/source/blender: added comments for bad transform stuff

[Campbell Barton]

Revision: 14501
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14501
Author:   campbellbarton
Date:     2008-04-21 11:50:26 +0200 (Mon, 21 Apr 2008)

Log Message:
-----------
added comments for bad transform stuff

Modified Paths:
--------------
    branches/apricot/source/blender/include/BSE_drawview.h
    branches/apricot/source/blender/include/transform.h
    branches/apricot/source/blender/src/buttons_editing.c
    branches/apricot/source/blender/src/retopo.c
    branches/apricot/source/blender/src/transform.c
    branches/apricot/source/blender/src/transform_conversions.c

Modified: branches/apricot/source/blender/include/BSE_drawview.h
===================================================================
--- branches/apricot/source/blender/include/BSE_drawview.h	2008-04-21 09:24:04 UTC (rev 14500)
+++ branches/apricot/source/blender/include/BSE_drawview.h	2008-04-21 09:50:26 UTC (rev 14501)
@@ -59,8 +59,6 @@
 void draw_depth(struct ScrArea *sa, void *spacedata, int (*func)(void *) );
 void view3d_update_depths(struct View3D *v3d);
 
-void (*foo)(int);
-
 int update_time(void);
 void calc_viewborder(struct View3D *v3d, struct rctf *viewborder_r);
 void view3d_set_1_to_1_viewborder(struct View3D *v3d);

Modified: branches/apricot/source/blender/include/transform.h
===================================================================
--- branches/apricot/source/blender/include/transform.h	2008-04-21 09:24:04 UTC (rev 14500)
+++ branches/apricot/source/blender/include/transform.h	2008-04-21 09:50:26 UTC (rev 14501)
@@ -31,7 +31,7 @@
 #define TRANSFORM_H
 
 #include "BIF_transform.h"
-#include "BIF_glutil.h"
+#include "BIF_glutil.h" /* APRICOT HACK */
 
 /* ************************** Types ***************************** */
 

Modified: branches/apricot/source/blender/src/buttons_editing.c
===================================================================
--- branches/apricot/source/blender/src/buttons_editing.c	2008-04-21 09:24:04 UTC (rev 14500)
+++ branches/apricot/source/blender/src/buttons_editing.c	2008-04-21 09:50:26 UTC (rev 14501)
@@ -876,7 +876,7 @@
 		}
 		uiBlockEndAlign(block);
 	} else {
-		but= uiDefButBitC(block,TOG,RETOPO,B_NOP, "Ground Snap", 10,130,170,19, &G.scene->toolsettings->retopo_mode, 0,0,0,0, "");
+		but= uiDefButBitC(block,TOG,RETOPO,B_NOP, "Ground Snap", 10,130,170,19, &G.scene->toolsettings->retopo_mode, 0,0,0,0, ""); /* APRICOT HACK*/
 	}
 
 	uiBlockBeginAlign(block);

Modified: branches/apricot/source/blender/src/retopo.c
===================================================================
--- branches/apricot/source/blender/src/retopo.c	2008-04-21 09:24:04 UTC (rev 14500)
+++ branches/apricot/source/blender/src/retopo.c	2008-04-21 09:50:26 UTC (rev 14501)
@@ -71,7 +71,7 @@
 #include "editmesh.h"
 #include "mydevice.h"
 
-#include "blendef.h"
+#include "blendef.h" /* APRICOT HACK */
 
 #ifdef WIN32
 #define _USE_MATH_DEFINES
@@ -738,7 +738,7 @@
 	return G.obedit && (G.obedit->type==OB_CURVE ||
 		            G.obedit->type==OB_SURF) && (((Curve*)G.obedit->data)->flag & CU_RETOPO);
 }
-char retopo_object_check()
+char retopo_object_check() /* APRICOT HACK */
 {
 	return ((G.obedit==0) && ((FACESEL_PAINT_TEST)==0) && (G.f & G_PARTICLEEDIT)==0 && (G.f & G_SCULPTMODE)==0 && (G.scene->toolsettings->retopo_mode & RETOPO));
 }
@@ -798,10 +798,12 @@
 	retopo_do_2d(v3d,proj,v,0);
 }
 
+#if 0
 static int testbase_unselected( void *base )
 {
 	return (((Base *)base)->flag & SELECT) ? 0 : 1;
 }
+#endif
 
 void retopo_do_all()
 {
@@ -861,7 +863,9 @@
 			DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA);
 			allqueue(REDRAWVIEW3D, 0);			
 		}
-	} else if(retopo_object_check()) {
+	}
+#if 0
+	else if(retopo_object_check()) {
 		//if(rvd) {
 		if (1) {
 		
@@ -921,6 +925,7 @@
 			// ---
 		}
 	}
+#endif
 }
 
 void retopo_do_all_cb(void *j1, void *j2)

Modified: branches/apricot/source/blender/src/transform.c
===================================================================
--- branches/apricot/source/blender/src/transform.c	2008-04-21 09:24:04 UTC (rev 14500)
+++ branches/apricot/source/blender/src/transform.c	2008-04-21 09:50:26 UTC (rev 14501)
@@ -2943,14 +2943,13 @@
 	}
 }
 
+/* APRICOT HACK */
 static int testbase_unselected( void *base )
 {
 	return (((Base *)base)->flag & SELECT) ? 0 : 1;
 }
 
-
-
-
+/* APRICOT HACK */
 static void applyTranslationRetopo(TransInfo *t) {
 	TransData *td = t->data;
 	//float tvec[3];
@@ -2958,7 +2957,7 @@
 
 	
 	// -----------------
-	/* APRICOT HACK */
+	
 	Base *base;
 	Object *ob;
 	short s[2];
@@ -3013,14 +3012,11 @@
 				}
 			}
 		}
-		
-		//VecAddf(td->loc, td->iloc, tvec);
 	}
 	
 	v3d->depths->depths = NULL;
-	//txdepth = NULL;
-	
 }
+extern char retopo_object_check(); 
 
 /* uses t->vec to store actual translation in */
 int Translation(TransInfo *t, short mval[2]) 

Modified: branches/apricot/source/blender/src/transform_conversions.c
===================================================================
--- branches/apricot/source/blender/src/transform_conversions.c	2008-04-21 09:24:04 UTC (rev 14500)
+++ branches/apricot/source/blender/src/transform_conversions.c	2008-04-21 09:50:26 UTC (rev 14501)
@@ -3427,9 +3427,11 @@
 	short redrawipo=0, resetslowpar=1;
 	int cancelled= (t->state == TRANS_CANCEL);
 	
+	/* APRICOT HACK */
 	if (t->txdepth) MEM_freeN(t->txdepth);
 	t->txdepth = NULL;
-		
+	/* end... */
+	
 	if (t->spacetype==SPACE_VIEW3D) {
 		if (G.obedit) {
 			if (cancelled==0) {