diff options
author | Maxime Curioni <maxime.curioni@gmail.com> | 2009-03-21 07:51:51 +0300 |
---|---|---|
committer | Maxime Curioni <maxime.curioni@gmail.com> | 2009-03-21 07:51:51 +0300 |
commit | f520fb2426f515b815d0c3de2dbe4de247475574 (patch) | |
tree | 61b6d83e913a26e366a263c79da1966d54e9e21a | |
parent | c1611c346ff4d8f88f1dcba8e5fada71930551bb (diff) |
Corrected stroke/Operators.cpp to compile without warnings
Cleaned up comments
-rw-r--r-- | source/blender/freestyle/SConscript | 28 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app_blender/Controller.cpp | 8 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/Operators.cpp | 3 |
3 files changed, 2 insertions, 37 deletions
diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript index 09c394a3bc4..e83736551a7 100644 --- a/source/blender/freestyle/SConscript +++ b/source/blender/freestyle/SConscript @@ -71,31 +71,3 @@ env.BlenderLib (libname="bf_freestyle", priority = [25] ) -######################################################## -# SWIG -######################################################## -# swig -# -# 1] Run the following three commands in the source/blender/freestyle/intern/swig directory. -# -# 2] Replace /Users/mx/Documents/work/GSoC_2008/bf-blender/branches/build/darwin/lib to the path -# of your library directory (used to locate libbf_freestyle.a) -# -# 3] Replace the python directories to suit your config - -# export SWIG_LIB=/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/extern/freestyle/swig/Lib - -# cd /Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/intern/swig - -# /Users/mx/Documents/work/GSoC_2008/bf-blender/branches/build/darwin/bin/swig -c++ -python -o ModuleWrapper.cpp Freestyle.i - -# mv ./Freestyle.py ../../python/ - -# g++ -w -I../geometry -I../image -I../scene_graph -I../stroke -I../system -I../view_map -I../winged_edge -I/usr/include/python2.5 -I../../../blenlib -I../../../blenkernel -I../../../imbuf -I../../../makesdna -c ModuleWrapper.cpp -o ModuleWrapper.o - -########### Mac OS X ########### -# g++ -bundle -flat_namespace -undefined suppress -w -L/usr/lib/python2.5/config -L/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/build/darwin/lib -lpython2.5 -lbf_freestyle -o ../../python/_Freestyle.so ModuleWrapper.o - -########### Linux ########### -# g++ -shared -w -L/usr/lib/python2.5/config -L/home/joe/bf_blender_freestyle/build/linux2/lib -lpython2.5 -lbf_freestyle -o ../../python/_Freestyle.so ModuleWrapper.o - diff --git a/source/blender/freestyle/intern/app_blender/Controller.cpp b/source/blender/freestyle/intern/app_blender/Controller.cpp index 8cdb13d131d..8c00dd9b3f3 100755 --- a/source/blender/freestyle/intern/app_blender/Controller.cpp +++ b/source/blender/freestyle/intern/app_blender/Controller.cpp @@ -649,14 +649,6 @@ void Controller::RenderBlender(Render *re) { void Controller::InsertStyleModule(unsigned index, const char *iFileName) { - // QFileInfo fi(iFileName); - // string ext = fi.suffix(); - // if (ext != "py") { - // cerr << "Error: Cannot load \"" << fi.fileName().toAscii().data() - // << "\", unknown extension" << endl; - // return; - // } - if( !BLI_testextensie(iFileName, ".py") ) { cerr << "Error: Cannot load \"" << StringUtils::toAscii( string(iFileName) ) << "\", unknown extension" << endl; diff --git a/source/blender/freestyle/intern/stroke/Operators.cpp b/source/blender/freestyle/intern/stroke/Operators.cpp index ab940d9a24d..950c9570f0e 100755 --- a/source/blender/freestyle/intern/stroke/Operators.cpp +++ b/source/blender/freestyle/intern/stroke/Operators.cpp @@ -20,6 +20,7 @@ /////////////////////////////////////////////////////////////////////////////// #include <algorithm> +#include <stdexcept> #include "Operators.h" #include "Canvas.h" #include "Stroke.h" @@ -978,7 +979,7 @@ inline int applyShading(Stroke& stroke, vector<StrokeShader*>& shaders) { int Operators::create(UnaryPredicate1D& pred, vector<StrokeShader*> shaders) { - Canvas* canvas = Canvas::getInstance(); + //Canvas* canvas = Canvas::getInstance(); if (!_current_set) { cerr << "Warning: current set empty" << endl; return 0; |