Commit 75b1b7c7 authored by Hans-Christian Ebke's avatar Hans-Christian Ebke

Changed ACG::Scenegraph::Material interface.

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@18014 383ad7c9-94d9-4d36-a494-682f7c89f535
parent c403eb87
......@@ -1120,7 +1120,7 @@ QStringList collectObjectComments(bool visibleOnly, bool targetedOnly) {
}
QStringList collectObjectMaterials(bool visibleOnly, bool targetedOnly) {
if (!ACG::SceneGraph::Material::CP_JSON_SERIALIZABLE)
if (!ACG::SceneGraph::Material::support_json_serialization())
return QStringList();
QStringList result;
......
......@@ -521,7 +521,7 @@ void CoreWidget::viewerSnapshotDialog() {
SnapshotDialog dialog(suggest, true, w, h, 0);
if (!ACG::SceneGraph::Material::CP_JSON_SERIALIZABLE)
if (!ACG::SceneGraph::Material::support_json_serialization())
dialog.metaData_storeMatInfo_cb->setVisible(false);
bool ok = dialog.exec();
......@@ -547,7 +547,8 @@ void CoreWidget::viewerSnapshotDialog() {
}
QString materials;
if (ACG::SceneGraph::Material::CP_JSON_SERIALIZABLE &&
if (ACG::SceneGraph::Material::support_json_serialization() &&
//if (ACG::SceneGraph::Material::CP_JSON_SERIALIZABLE &&
dialog.metaData_storeMatInfo_cb->isChecked()) {
materials = PluginFunctions::collectObjectMaterials(
dialog.metaData_comments_visibleOnly_cb->isChecked(),
......
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