diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-04-01 05:15:23 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-04-01 05:15:23 +0400 |
| commit | 65b2ef5b15ae56758f7097df98dbce9ba3fe1454 (patch) | |
| tree | 2a4568b34d48ea678c8de56ab9aaec4be2bf5c33 | |
| parent | fdffaacb8a909e6f5d7ecb984eee7b51ad986fbd (diff) | |
Fixed a compiler error in AppCanvas.h (thanks paulhart2). Also fixed
a compiler warning in pipeline.c with regard to the missing prototype
definition of free_libblock().
| -rwxr-xr-x | source/blender/freestyle/intern/application/AppCanvas.h | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/freestyle/intern/application/AppCanvas.h b/source/blender/freestyle/intern/application/AppCanvas.h index 5f27f97c8d5..42b3c7fdb50 100755 --- a/source/blender/freestyle/intern/application/AppCanvas.h +++ b/source/blender/freestyle/intern/application/AppCanvas.h @@ -40,7 +40,7 @@ public: /*! accessors */ virtual int width() const ; virtual int height() const ; - virtual BBox<Vec2i> AppCanvas::border() const ; + virtual BBox<Vec2i> border() const ; AppView *_pViewer; inline const AppView * viewer() const {return _pViewer;} diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index e654043931c..7baaf5fa8d1 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -42,6 +42,7 @@ #include "BKE_utildefines.h" #include "BKE_global.h" #include "BKE_image.h" +#include "BKE_library.h" #include "BKE_main.h" #include "BKE_node.h" #include "BKE_object.h" |