22 lines
773 B
Diff
22 lines
773 B
Diff
--- app/viewport/render/instance.h.orig 2016-11-27 19:16:48.000000000 -0700
|
|
+++ app/viewport/render/instance.h 2018-06-28 14:44:06.985669560 -0600
|
|
@@ -1,6 +1,8 @@
|
|
#pragma once
|
|
|
|
+#undef slots
|
|
#include <Python.h>
|
|
+#define slots Q_SLOTS
|
|
#include <QObject>
|
|
|
|
#include "viewport/image.h"
|
|
--- lib/graph/src/util.cpp.orig 2016-11-27 19:16:48.000000000 -0700
|
|
+++ lib/graph/src/util.cpp 2018-06-28 14:19:57.332549621 -0600
|
|
@@ -47,7 +47,7 @@ std::pair<std::string, int> getPyError()
|
|
error_traceback = "";
|
|
for (int i=0; i < PyList_Size(lst); ++i)
|
|
{
|
|
- char* c = PyUnicode_AsUTF8(PyList_GetItem(lst, i));
|
|
+ const char* c = PyUnicode_AsUTF8(PyList_GetItem(lst, i));
|
|
assert(!PyErr_Occurred());
|
|
error_traceback += std::string(c);
|
|
}
|