Step 3/3, merging subdivision/bone creation methods using iterators

This also adds a special Embedding option called "Peel Objects". This option makes the embedding snap consider objects as whole, taking the first and last hit of each of them to calculate the embedding point (instead of peeling with first/second, third/fourth and so on). This option is useful if you have mecanical pieces with lots of details (as single objects) and want to put bones in the middle (think of adding bones to a mecha, for example).

1 files changed, 6 insertions, 4 deletions

diff --git a/source/blender/include/reeb.h b/source/blender/include/reeb.h
index 21c57495fb0..2f463d6194b 100644
--- a/source/blender/include/reeb.h
+++ b/source/blender/include/reeb.h
@@ -28,7 +28,7 @@
 #ifndef REEB_H_
 #define REEB_H_
 
-#define WITH_BF_REEB
+//#define WITH_BF_REEB
 
 #include "DNA_listBase.h"
 
@@ -120,6 +120,8 @@ typedef struct ReebArc {
 } ReebArc;
 
 typedef struct ReebArcIterator {
+	HeadFct		head;
+	TailFct		tail;
 	PeekFct		peek;
 	NextFct		next;
 	NextNFct	nextN;
@@ -151,9 +153,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);
+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);