diff options
Diffstat (limited to 'source/blender/freestyle')
-rw-r--r-- | source/blender/freestyle/intern/scene_graph/FrsMaterial.h | 18 | ||||
-rw-r--r-- | source/blender/freestyle/intern/stroke/Curve.h | 2 | ||||
-rw-r--r-- | source/blender/freestyle/intern/view_map/ViewMapIO.h | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/freestyle/intern/scene_graph/FrsMaterial.h b/source/blender/freestyle/intern/scene_graph/FrsMaterial.h index ecdba75b864..a66380f01be 100644 --- a/source/blender/freestyle/intern/scene_graph/FrsMaterial.h +++ b/source/blender/freestyle/intern/scene_graph/FrsMaterial.h @@ -57,8 +57,8 @@ class FrsMaterial { const float *iAmbiant, const float *iSpecular, const float *iEmission, - const float iShininess, - const int iPriority); + float iShininess, + int iPriority); /** Copy constructor */ inline FrsMaterial(const FrsMaterial &m); @@ -240,7 +240,7 @@ class FrsMaterial { * \param a: * Alpha component */ - inline void setLine(const float r, const float g, const float b, const float a); + inline void setLine(float r, float g, float b, float a); /** Sets the diffuse color. * \param r: @@ -252,7 +252,7 @@ class FrsMaterial { * \param a: * Alpha component */ - inline void setDiffuse(const float r, const float g, const float b, const float a); + inline void setDiffuse(float r, float g, float b, float a); /** Sets the specular color. * \param r: @@ -264,7 +264,7 @@ class FrsMaterial { * \param a: * Alpha component */ - inline void setSpecular(const float r, const float g, const float b, const float a); + inline void setSpecular(float r, float g, float b, float a); /** Sets the ambient color. * \param r: @@ -276,7 +276,7 @@ class FrsMaterial { * \param a: * Alpha component */ - inline void setAmbient(const float r, const float g, const float b, const float a); + inline void setAmbient(float r, float g, float b, float a); /** Sets the emissive color. * \param r: @@ -288,19 +288,19 @@ class FrsMaterial { * \param a: * Alpha component */ - inline void setEmission(const float r, const float g, const float b, const float a); + inline void setEmission(float r, float g, float b, float a); /** Sets the shininess. * \param s: * Shininess */ - inline void setShininess(const float s); + inline void setShininess(float s); /** Sets the line color priority. * \param priority: * Priority */ - inline void setPriority(const int priority); + inline void setPriority(int priority); /* operators */ inline FrsMaterial &operator=(const FrsMaterial &m); diff --git a/source/blender/freestyle/intern/stroke/Curve.h b/source/blender/freestyle/intern/stroke/Curve.h index 9a05fcd380b..b26408d8183 100644 --- a/source/blender/freestyle/intern/stroke/Curve.h +++ b/source/blender/freestyle/intern/stroke/Curve.h @@ -540,7 +540,7 @@ class Curve : public Interface1D { } const SShape *occluded_shape() const; - const bool occludee_empty() const; + bool occludee_empty() const; real z_discontinuity(int iCombination = 0) const; int shape_id() const; const SShape *shape() const; diff --git a/source/blender/freestyle/intern/view_map/ViewMapIO.h b/source/blender/freestyle/intern/view_map/ViewMapIO.h index e4c42c094d0..4b737f1eb8c 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapIO.h +++ b/source/blender/freestyle/intern/view_map/ViewMapIO.h @@ -44,11 +44,11 @@ namespace Options { static const unsigned char FLOAT_VECTORS = 1; static const unsigned char NO_OCCLUDERS = 2; -void setFlags(const unsigned char flags); +void setFlags(unsigned char flags); -void addFlags(const unsigned char flags); +void addFlags(unsigned char flags); -void rmFlags(const unsigned char flags); +void rmFlags(unsigned char flags); unsigned char getFlags(); |