archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix a few warnings. One was an actual bug in freestyle where stroke attributes

Browse Source 
were not properly interpolated.
This commit is contained in:
Brecht Van Lommel
2013-04-15 23:12:49 +00:00
parent afb4b65167
commit f4fe1b8e77
4 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/freestyle/intern/stroke/Stroke.cpp
View File

@@ -113,8 +113,8 @@ StrokeAttribute::StrokeAttribute(const StrokeAttribute& a1, const StrokeAttribut
if (a1._userAttributesReal->size() == a2._userAttributesReal->size()) {
_userAttributesReal = new realMap;
realMap::iterator it1 = a1._userAttributesReal->begin(), it1end = a1._userAttributesReal->end();
realMap::iterator it2 = a2._userAttributesReal->begin(), it2end = a2._userAttributesReal->end();
for (; it1 != it1end; ++it1) {
realMap::iterator it2 = a2._userAttributesReal->begin();
for (; it1 != it1end; ++it1, ++it2) {
(*_userAttributesReal)[(*it1).first] = ((1 - t) * (*it1).second + t * (*it2).second);
}
}
@@ -126,8 +126,8 @@ StrokeAttribute::StrokeAttribute(const StrokeAttribute& a1, const StrokeAttribut
if (a1._userAttributesVec2f->size() == a2._userAttributesVec2f->size()) {
_userAttributesVec2f = new Vec2fMap;
Vec2fMap::iterator it1 = a1._userAttributesVec2f->begin(), it1end = a1._userAttributesVec2f->end();
Vec2fMap::iterator it2 = a2._userAttributesVec2f->begin(), it2end = a2._userAttributesVec2f->end();
for (; it1 != it1end; ++it1) {
Vec2fMap::iterator it2 = a2._userAttributesVec2f->begin();
for (; it1 != it1end; ++it1, ++it2) {
(*_userAttributesVec2f)[(*it1).first] = ((1 - t) * (*it1).second + t * (*it2).second);
}
}
@@ -139,8 +139,8 @@ StrokeAttribute::StrokeAttribute(const StrokeAttribute& a1, const StrokeAttribut
if (a1._userAttributesVec3f->size() == a2._userAttributesVec3f->size()) {
_userAttributesVec3f = new Vec3fMap;
Vec3fMap::iterator it1 = a1._userAttributesVec3f->begin(), it1end = a1._userAttributesVec3f->end();
Vec3fMap::iterator it2 = a2._userAttributesVec3f->begin(), it2end = a2._userAttributesVec3f->end();
for (; it1 != it1end; ++it1) {
Vec3fMap::iterator it2 = a2._userAttributesVec3f->begin();
for (; it1 != it1end; ++it1, ++it2) {
(*_userAttributesVec3f)[(*it1).first] = ((1 - t) * (*it1).second + t * (*it2).second);
}
}
@@ -659,8 +659,6 @@ void Stroke::RemoveVertex(StrokeVertex *iVertex)
void Stroke::InsertVertex(StrokeVertex *iVertex, StrokeInternal::StrokeVertexIterator next)
{
vertex_container::iterator it = _Vertices.begin(), itend = _Vertices.end();
vertex_container::iterator itnext = next.getIt();
_Vertices.insert(itnext, iVertex);
UpdateLength();