Remove the ETL_FIXED_DERIVATIVE macro.

[synfig.git] / synfig-studio / trunk / src / gtkmm / state_bline.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/state_bline.cpp b/synfig-studio/trunk/src/gtkmm/state_bline.cpp
index f632f2e..cee1d8d 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/state_bline.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_bline.cpp
@@ -1006,7 +1006,7 @@ StateBLine_Context::refresh_ducks(bool button_down)
                duck->signal_user_click(2).connect(
                        sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::popup_vertex_menu),value_node)
                );
-               duck->set_guid(value_node->get_guid()^GUID::hasher(0));
+               duck->set_guid(value_node->get_guid()^synfig::GUID::hasher(0));
 
                get_work_area()->add_duck(duck);
 
@@ -1017,7 +1017,7 @@ StateBLine_Context::refresh_ducks(bool button_down)
                tduck->set_origin(duck);
                tduck->set_scalar(-0.33333333333333333);
                tduck->set_tangent(true);
-               tduck->set_guid(value_node->get_guid()^GUID::hasher(3));
+               tduck->set_guid(value_node->get_guid()^synfig::GUID::hasher(3));
                tduck->signal_edited().connect(
                        sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::on_tangent1_change),value_node)
                );
@@ -1080,7 +1080,7 @@ StateBLine_Context::refresh_ducks(bool button_down)
                                sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::on_tangent1_change),value_node)
                        );
                }
-               tduck->set_guid(value_node->get_guid()^GUID::hasher(4));
+               tduck->set_guid(value_node->get_guid()^synfig::GUID::hasher(4));
                tduck->signal_user_click(2).connect(
                        sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::popup_handle_menu),value_node)
                );
@@ -1165,8 +1165,8 @@ StateBLine_Context::refresh_ducks(bool button_down)
                //get_work_area()->add_duck(bezier->c2);
                get_work_area()->add_bezier(bezier);
 
-               duck->set_guid(GUID());
-               tduck->set_guid(GUID());
+               duck->set_guid(synfig::GUID());
+               tduck->set_guid(synfig::GUID());
 
                next_duck=duck;
        }
@@ -1306,11 +1306,7 @@ StateBLine_Context::bline_insert_vertex(synfig::ValueNode_Const::Handle value_no
 
                        bline_point.set_vertex(curve(origin));
                        bline_point.set_width((next_bline_point.get_width()-prev_bline_point.get_width())*origin+prev_bline_point.get_width());
-#ifdef ETL_FIXED_DERIVATIVE
                        bline_point.set_tangent1(deriv(origin)*std::min(1.0f-origin,origin));
-#else
-                       bline_point.set_tangent1(-deriv(origin)*std::min(1.0f-origin,origin));
-#endif
                        bline_point.set_tangent2(bline_point.get_tangent1());
                        bline_point.set_split_tangent_flag(false);
                        bline_point.set_origin(origin);