Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/freestyle/intern/view_map/Functions0D.h')
-rwxr-xr-xsource/blender/freestyle/intern/view_map/Functions0D.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/freestyle/intern/view_map/Functions0D.h b/source/blender/freestyle/intern/view_map/Functions0D.h
index 9543e8c34a6..24d2edac094 100755
--- a/source/blender/freestyle/intern/view_map/Functions0D.h
+++ b/source/blender/freestyle/intern/view_map/Functions0D.h
@@ -34,7 +34,7 @@
# include "Interface0D.h"
# include "../geometry/Geom.h"
# include "../system/Exception.h"
-# include "../scene_graph/Material.h"
+# include "../scene_graph/FrsMaterial.h"
# include <set>
# include <vector>
class FEdge;
@@ -350,7 +350,7 @@ namespace Functions0D {
* to deal with this cases in a specific way should implement
* its own getMaterial functor.
*/
- class LIB_VIEW_MAP_EXPORT MaterialF0D : public UnaryFunction0D<Material>
+ class LIB_VIEW_MAP_EXPORT MaterialF0D : public UnaryFunction0D<FrsMaterial>
{
public:
/*! Returns the string "MaterialF0D"*/
@@ -358,7 +358,7 @@ namespace Functions0D {
return "MaterialF0D";
}
/*! the () operator.*/
- Material operator()(Interface0DIterator& iter);
+ FrsMaterial operator()(Interface0DIterator& iter);
};
// ShapeIdF0D