[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23871] branches/soc-2008-mxcurioni/source /blender/freestyle/intern/application/AppView.cpp: Moved #include " BLI_jitter.h" to the beginning of a series of

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Thu Oct 15 21:32:07 CEST 2009


Revision: 23871
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23871
Author:   kjym3
Date:     2009-10-15 21:32:07 +0200 (Thu, 15 Oct 2009)

Log Message:
-----------
Moved #include "BLI_jitter.h" to the beginning of a series of
#include statements as a workaround of symbol conflicts involving
rad1 and rad2 in the header file.  As a side note, a different
solution of the issue was attempted in revision 17518 of the branch.

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17518

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/AppView.cpp

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/AppView.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/AppView.cpp	2009-10-15 19:23:11 UTC (rev 23870)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/AppView.cpp	2009-10-15 19:32:07 UTC (rev 23871)
@@ -19,6 +19,10 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+extern "C" {
+#include "BLI_jitter.h"
+}
+
 #include <iostream>
 #include "../stroke/Canvas.h"
 #include "AppView.h"
@@ -35,7 +39,6 @@
 
 extern "C" {
 #include "BLI_blenlib.h"
-#include "BLI_jitter.h"
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 #if 1 // FRS_antialiasing





More information about the Bf-blender-cvs mailing list