1 files changed, 22 insertions, 13 deletions

diff --git a/source/blender/editors/armature/reeb.h b/source/blender/editors/armature/reeb.h
index c4c062196fc..6aeb0a37f78 100644
--- a/source/blender/editors/armature/reeb.h
+++ b/source/blender/editors/armature/reeb.h
@@ -25,7 +25,7 @@
 #ifndef REEB_H_
 #define REEB_H_
 
-//#define WITH_BF_REEB
+#define WITH_BF_REEB
 
 #include "DNA_listBase.h"
 
@@ -60,6 +60,7 @@ typedef struct EmbedBucket {
 	float val;
 	int	  nv;
 	float p[3];
+	float no[3]; /* if non-null, normal of the bucket */
 } EmbedBucket;
 
 typedef struct ReebNode {
@@ -76,6 +77,8 @@ typedef struct ReebNode {
 	int symmetry_flag;
 	float symmetry_axis[3];
 	/*********************************/
+	
+	float no[3];
 
 	int index;
 	float weight;
@@ -114,12 +117,23 @@ typedef struct ReebArc {
 } ReebArc;
 
 typedef struct ReebArcIterator {
-	struct ReebArc	*arc;
+	HeadFct		head;
+	TailFct		tail;
+	PeekFct		peek;
+	NextFct		next;
+	NextNFct	nextN;
+	PreviousFct	previous;
+	StoppedFct	stopped;
+	
+	float *p, *no;
+	
+	int length;
 	int index;
+	/*********************************/
+	struct ReebArc	*arc;
 	int start;
 	int end;
-	int stride; 
-	int length;
+	int stride;
 } ReebArcIterator;
 
 struct EditMesh;
@@ -136,15 +150,9 @@ void renormalizeWeight(struct EditMesh *em, float newmax);
 ReebGraph * generateReebGraph(struct EditMesh *me, int subdivisions);
 ReebGraph * newReebGraph();
 
-void initArcIterator(struct ReebArcIterator *iter, struct ReebArc *arc, struct ReebNode *head);
-void initArcIterator2(struct ReebArcIterator *iter, struct ReebArc *arc, int start, int end);
-void initArcIteratorStart(struct ReebArcIterator *iter, struct ReebArc *arc, struct ReebNode *head, int start);
-struct EmbedBucket * nextBucket(struct ReebArcIterator *iter);
-struct EmbedBucket * nextNBucket(ReebArcIterator *iter, int n);
-struct EmbedBucket * peekBucket(ReebArcIterator *iter, int n);
-struct EmbedBucket * currentBucket(struct ReebArcIterator *iter);
-struct EmbedBucket * previousBucket(struct ReebArcIterator *iter);
-int iteratorStopped(struct ReebArcIterator *iter);
+void initArcIterator(BArcIterator *iter, struct ReebArc *arc, struct ReebNode *head);
+void initArcIterator2(BArcIterator *iter, struct ReebArc *arc, int start, int end);
+void initArcIteratorStart(BArcIterator *iter, struct ReebArc *arc, struct ReebNode *head, int start);
 
 /* Filtering */
 void filterNullReebGraph(ReebGraph *rg);
@@ -182,6 +190,7 @@ ReebNode *BIF_lowestLevelNode(ReebNode *node);
 ReebGraph *BIF_graphForMultiNode(ReebGraph *rg, ReebNode *node);
 
 void REEB_freeGraph(ReebGraph *rg);
+void REEB_freeArc(BArc *barc);
 void REEB_exportGraph(ReebGraph *rg, int count);
 void REEB_draw();