Revision: 56074
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56074
Author: blendix
Date: 2013-04-15 23:12:49 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
Fix a few warnings. One was an actual bug in freestyle where stroke attributes
were not properly interpolated.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_node/node_add.c
trunk/blender/source/blender/editors/space_node/node_group.c
trunk/blender/source/blender/freestyle/intern/image/GaussianFilter.h
trunk/blender/source/blender/freestyle/intern/stroke/Stroke.cpp
Modified: trunk/blender/source/blender/editors/space_node/node_add.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_add.c 2013-04-15
23:12:40 UTC (rev 56073)
+++ trunk/blender/source/blender/editors/space_node/node_add.c 2013-04-15
23:12:49 UTC (rev 56074)
@@ -445,6 +445,8 @@
}
else if (snode)
idname = snode->tree_idname;
+ else
+ return OPERATOR_CANCELLED;
if (RNA_struct_property_is_set(op->ptr, "name")) {
RNA_string_get(op->ptr, "name", treename);
Modified: trunk/blender/source/blender/editors/space_node/node_group.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_group.c
2013-04-15 23:12:40 UTC (rev 56073)
+++ trunk/blender/source/blender/editors/space_node/node_group.c
2013-04-15 23:12:49 UTC (rev 56074)
@@ -338,8 +338,8 @@
/* if group output is not externally linked,
* convert the constant input value to ensure somewhat
consistent behavior */
if (num_external_links == 0) {
- bNodeSocket *sock =
node_group_find_input_socket(gnode, identifier);
- BLI_assert(sock);
+ /* XXX TODO bNodeSocket *sock =
node_group_find_input_socket(gnode, identifier);
+ BLI_assert(sock);*/
/* XXX TODO nodeSocketCopy(ntree,
link->tosock->new_sock, link->tonode->new_node, ntree, sock, gnode);*/
}
@@ -366,8 +366,8 @@
/* if group output is not internally linked,
* convert the constant output value to ensure somewhat
consistent behavior */
if (num_internal_links == 0) {
- bNodeSocket *sock =
node_group_find_output_socket(gnode, identifier);
- BLI_assert(sock);
+ /* XXX TODO bNodeSocket *sock =
node_group_find_output_socket(gnode, identifier);
+ BLI_assert(sock);*/
/* XXX TODO nodeSocketCopy(ntree, link->tosock,
link->tonode, ntree, sock, gnode); */
}
Modified: trunk/blender/source/blender/freestyle/intern/image/GaussianFilter.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/image/GaussianFilter.h
2013-04-15 23:12:40 UTC (rev 56073)
+++ trunk/blender/source/blender/freestyle/intern/image/GaussianFilter.h
2013-04-15 23:12:49 UTC (rev 56074)
@@ -125,10 +125,6 @@
*/
-#ifdef __MACH__
-# define sqrtf(x) (sqrt(x))
-#endif
-
template<class Map>
float GaussianFilter::getSmoothedPixel(Map *map, int x, int y)
{
Modified: trunk/blender/source/blender/freestyle/intern/stroke/Stroke.cpp
===================================================================
--- trunk/blender/source/blender/freestyle/intern/stroke/Stroke.cpp
2013-04-15 23:12:40 UTC (rev 56073)
+++ trunk/blender/source/blender/freestyle/intern/stroke/Stroke.cpp
2013-04-15 23:12:49 UTC (rev 56074)
@@ -113,8 +113,8 @@
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 @@
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 @@
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::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();
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
