Made object names accessible from within style modules.

ViewShape objects in the view map, as well as SShape objects
that can be retrieved with ViewShape::sshape(), now have a
getName() method that returns the name of the object from
which each shape is created.  For instance, visible feature
edges of specific mesh objects (e.g., Cube.001 and Cube.002)
can be selected using custom predicate ObjectNamesUP1D as
follows:

class ObjectNamesUP1D(UnaryPredicate1D):
    def __init__(self, names):
        UnaryPredicate1D.__init__(self)
        self._names = names
    def getName(self):
        return "ObjectNamesUP1D"
    def __call__(self, viewEdge):
        return viewEdge.viewShape().getName() in self._names

upred = AndUP1D(QuantitativeInvisibilityUP1D(0),
                ObjectNamesUP1D(["Cube.001", "Cube.002"]))
Operators.select(upred)

3 files changed, 13 insertions, 8 deletions

diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.cpp b/source/blender/freestyle/intern/winged_edge/WEdge.cpp
index 95be5f55794..1a3c9341374 100755
--- a/source/blender/freestyle/intern/winged_edge/WEdge.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WEdge.cpp
@@ -475,6 +475,7 @@ WShape * WShape::duplicate()
 WShape::WShape(WShape& iBrother)
 {
   _Id = iBrother.GetId();
+  _Name = iBrother._Name;
   _FrsMaterials = iBrother._FrsMaterials;
   _meanEdgeSize = iBrother._meanEdgeSize;
   iBrother.bbox(_min, _max);
diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.h b/source/blender/freestyle/intern/winged_edge/WEdge.h
index 9b05b4577a9..ebf26cd6d23 100755
--- a/source/blender/freestyle/intern/winged_edge/WEdge.h
+++ b/source/blender/freestyle/intern/winged_edge/WEdge.h
@@ -156,10 +156,10 @@ public:
       increment();
       return *this;
     }
-    virtual incoming_edge_iterator operator++(int)  // opérateur correspondant à i++ 
-    {                                  // c.a.d qui renvoie la valeur *puis* incrémente.
-      incoming_edge_iterator tmp = *this;        // C'est pour cela qu'on stocke la valeur
-      increment();                    // dans un temporaire. 
+    virtual incoming_edge_iterator operator++(int)  // operator corresponding to i++
+    {
+      incoming_edge_iterator tmp = *this;
+      increment();
       return tmp;
     } 
   
@@ -231,10 +231,10 @@ public:
       increment();
       return *this;
     }
-    virtual face_iterator operator++(int)  // opérateur correspondant à i++ 
-    {                                  // c.a.d qui renvoie la valeur *puis* incrémente.
-      face_iterator tmp = *this;        // C'est pour cela qu'on stocke la valeur
-      increment();                    // dans un temporaire. 
+    virtual face_iterator operator++(int)  // operator corresponding to i++ 
+    {
+      face_iterator tmp = *this;
+      increment();
       return tmp;
     } 
   
@@ -699,6 +699,7 @@ protected:
   vector<WEdge*>   _EdgeList;
   vector<WFace*>   _FaceList;
   int _Id; 
+  string _Name;
   static unsigned _SceneCurrentId;
   Vec3r _min;
   Vec3r _max;
@@ -752,6 +753,7 @@ public:
   inline const FrsMaterial& frs_material(unsigned i) const  {return _FrsMaterials[i];}
   inline const vector<FrsMaterial>& frs_materials() const {return _FrsMaterials;}
   inline const real getMeanEdgeSize() const {return _meanEdgeSize;}
+  inline const string& getName() const {return _Name;}
   /*! modifiers */
   static inline void setCurrentId(const unsigned id) { _SceneCurrentId = id; }
   inline void setEdgeList(const vector<WEdge*>& iEdgeList) {_EdgeList = iEdgeList;}
@@ -761,6 +763,7 @@ public:
   inline void setBBox(const Vec3r& min, const Vec3r& max) {_min = min; _max=max;}
   inline void setFrsMaterial(const FrsMaterial& frs_material, unsigned i) {_FrsMaterials[i]=frs_material;}
   inline void setFrsMaterials(const vector<FrsMaterial>& iMaterials) {_FrsMaterials = iMaterials;}
+  inline void setName(const string& name) {_Name = name;}
 
   /*! designed to build a specialized WFace 
    *  for use in MakeFace
diff --git a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp
index 9d22b4f8db5..80e06fc2b7b 100755
--- a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp
@@ -26,6 +26,7 @@ void WXEdgeBuilder::visitIndexedFaceSet(IndexedFaceSet& ifs)
   WXShape *shape = new WXShape;
   buildWShape(*shape, ifs);
   shape->setId(ifs.getId().getFirst());
+  shape->setName(ifs.getName());
   //ifs.setId(shape->GetId());
 }