Commit 8fef60f3 authored by Jouni Pentikäinen's avatar Jouni Pentikäinen

Fix non-openGL build

parent 89daca00
...@@ -118,8 +118,8 @@ ...@@ -118,8 +118,8 @@
#include "kis_action_manager.h" #include "kis_action_manager.h"
#include "thememanager.h" #include "thememanager.h"
#include "kis_resource_server_provider.h" #include "kis_resource_server_provider.h"
#include "kis_animation_importer.h"
#ifdef HAVE_OPENGL #ifdef HAVE_OPENGL
#include "kis_animation_importer.h"
#include "kis_animation_exporter.h" #include "kis_animation_exporter.h"
#endif #endif
#include "kis_icon_utils.h" #include "kis_icon_utils.h"
...@@ -220,8 +220,8 @@ public: ...@@ -220,8 +220,8 @@ public:
KisAction *printAction; KisAction *printAction;
KisAction *printActionPreview; KisAction *printActionPreview;
KisAction *exportPdf; KisAction *exportPdf;
KisAction *importAnimation;
#ifdef HAVE_OPENGL #ifdef HAVE_OPENGL
KisAction *importAnimation;
KisAction *exportAnimation; KisAction *exportAnimation;
#endif #endif
KisAction *closeAll; KisAction *closeAll;
...@@ -1488,6 +1488,7 @@ KisPrintJob* KisMainWindow::exportToPdf(KoPageLayout pageLayout, QString pdfFile ...@@ -1488,6 +1488,7 @@ KisPrintJob* KisMainWindow::exportToPdf(KoPageLayout pageLayout, QString pdfFile
void KisMainWindow::importAnimation() void KisMainWindow::importAnimation()
{ {
#ifdef HAVE_OPENGL
if (!activeView()) return; if (!activeView()) return;
KisDocument *document = activeView()->document(); KisDocument *document = activeView()->document();
...@@ -1497,6 +1498,7 @@ void KisMainWindow::importAnimation() ...@@ -1497,6 +1498,7 @@ void KisMainWindow::importAnimation()
importer.importSequence(document); importer.importSequence(document);
activeView()->canvasBase()->refetchDataFromImage(); activeView()->canvasBase()->refetchDataFromImage();
#endif
} }
void KisMainWindow::exportAnimation() void KisMainWindow::exportAnimation()
...@@ -2113,10 +2115,10 @@ void KisMainWindow::createActions() ...@@ -2113,10 +2115,10 @@ void KisMainWindow::createActions()
d->exportPdf = actionManager->createAction("file_export_pdf"); d->exportPdf = actionManager->createAction("file_export_pdf");
connect(d->exportPdf, SIGNAL(triggered()), this, SLOT(exportToPdf())); connect(d->exportPdf, SIGNAL(triggered()), this, SLOT(exportToPdf()));
#ifdef HAVE_OPENGL
d->importAnimation = actionManager->createAction("file_import_animation"); d->importAnimation = actionManager->createAction("file_import_animation");
connect(d->importAnimation, SIGNAL(triggered()), this, SLOT(importAnimation())); connect(d->importAnimation, SIGNAL(triggered()), this, SLOT(importAnimation()));
#ifdef HAVE_OPENGL
d->exportAnimation = actionManager->createAction("file_export_animation"); d->exportAnimation = actionManager->createAction("file_export_animation");
connect(d->exportAnimation, SIGNAL(triggered()), this, SLOT(exportAnimation())); connect(d->exportAnimation, SIGNAL(triggered()), this, SLOT(exportAnimation()));
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment