[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35044] branches/soc-2008-mxcurioni/source /blender/freestyle/intern: Two minor fixes:
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Tue Feb 22 02:43:08 CET 2011
Revision: 35044
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35044
Author: kjym3
Date: 2011-02-22 01:43:08 +0000 (Tue, 22 Feb 2011)
Log Message:
-----------
Two minor fixes:
* Fixed a bug in MaterialF0D::operator() that an error condition was ignored due
to a wrong return value.
* Fixed a typo in the docstring of StrokeVertex::setPoint().
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/Functions0D.cpp
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp 2011-02-22 01:39:56 UTC (rev 35043)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp 2011-02-22 01:43:08 UTC (rev 35044)
@@ -241,7 +241,7 @@
" :arg y: The Y coordinate.\n"
" :type y: float\n"
"\n"
-".. method:: SetPoint(p)\n"
+".. method:: setPoint(p)\n"
"\n"
" Sets the 2D point X and Y coordinates.\n"
"\n"
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/Functions0D.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/Functions0D.cpp 2011-02-22 01:39:56 UTC (rev 35043)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/Functions0D.cpp 2011-02-22 01:43:08 UTC (rev 35044)
@@ -289,13 +289,8 @@
int MaterialF0D::operator()(Interface0DIterator& iter) {
FEdge *fe1, *fe2;
getFEdges(iter,fe1,fe2);
-
- if(fe1 == 0) {
- // DEBUG
- getFEdges(iter, fe1, fe2);
- return 1;
- }
-
+ if(fe1 == 0)
+ return -1;
if(fe1->isSmooth())
result = ((FEdgeSmooth*)fe1)->frs_material();
else
More information about the Bf-blender-cvs
mailing list