From 3676513417024c29dce4082bf14fc175b79d8864 Mon Sep 17 00:00:00 2001
From: stefan <stefan@5a81b35b-ba03-0410-adc8-b2c5c5119f08>
Date: Tue, 9 Mar 2010 08:55:11 +0000
Subject: [PATCH] Renamed ApplyRenderOptions to ApplyOptions in gfx::Entity
git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@1791 5a81b35b-ba03-0410-adc8-b2c5c5119f08
---
modules/gfx/pymod/export_entity.cc | 2 +-
modules/gfx/src/entity.cc | 2 +-
modules/gfx/src/entity.hh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/gfx/pymod/export_entity.cc b/modules/gfx/pymod/export_entity.cc
index 68b10ebbe..b4a5fad25 100644
--- a/modules/gfx/pymod/export_entity.cc
+++ b/modules/gfx/pymod/export_entity.cc
@@ -272,7 +272,7 @@ void export_Entity()
.add_property("cartoon_options", &ent_hsc_opts)
.add_property("cpk_options", &ent_cpk_opts)
.add_property("trace_options", &ent_trace_opts)
- .def("ApplyRenderOptions", &Entity::ApplyRenderOptions)
+ .def("ApplyOptions", &Entity::ApplyOptions)
.def("SetOptions", &Entity::SetOptions)
.def("Apply",&ent_apply_11)
.def("Apply",&ent_apply_12)
diff --git a/modules/gfx/src/entity.cc b/modules/gfx/src/entity.cc
index ebc216065..8f06734f3 100644
--- a/modules/gfx/src/entity.cc
+++ b/modules/gfx/src/entity.cc
@@ -521,7 +521,7 @@ void Entity::SetOptions(RenderMode::Type render_mode,
}
}
-void Entity::ApplyRenderOptions(RenderMode::Type render_mode,
+void Entity::ApplyOptions(RenderMode::Type render_mode,
RenderOptionsPtr& render_options)
{
RendererMap::iterator i=renderer_.find(render_mode);
diff --git a/modules/gfx/src/entity.hh b/modules/gfx/src/entity.hh
index 6a84f8c9e..5c37201fb 100644
--- a/modules/gfx/src/entity.hh
+++ b/modules/gfx/src/entity.hh
@@ -247,7 +247,7 @@ public:
RenderOptionsPtr GetOptions(RenderMode::Type render_mode);
void SetOptions(RenderMode::Type render_mode,
RenderOptionsPtr& render_options);
- void ApplyRenderOptions(RenderMode::Type render_mode,
+ void ApplyOptions(RenderMode::Type render_mode,
RenderOptionsPtr& render_options);
bool HasSelection() const;
protected:
--
GitLab