X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer.cpp;h=d8676d9b6bbce9fff08658d120bd925ff87f741f;hb=b2c243deddefa52cd7e5ee9a50d2d2464bcef4ad;hp=6a36ca9e0abac4d930dede6c830a24562e9839d7;hpb=75ea37961f95850594aeee5fc8b4586276466193;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/layer.cpp b/synfig-core/trunk/src/synfig/layer.cpp index 6a36ca9..d8676d9 100644 --- a/synfig-core/trunk/src/synfig/layer.cpp +++ b/synfig-core/trunk/src/synfig/layer.cpp @@ -98,11 +98,10 @@ Layer::subsys_init() #define INCLUDE_LAYER(class) synfig::Layer::book()[synfig::String(class::name__)]=BookEntry(class::create,class::name__,class::local_name__,class::category__,class::cvs_id__,class::version__) #define LAYER_ALIAS(class,alias) synfig::Layer::book()[synfig::String(alias)]=synfig::Layer::BookEntry(class::create,alias,alias,_("Do Not Use"),class::cvs_id__,class::version__); - INCLUDE_LAYER(Layer_SolidColor); - INCLUDE_LAYER(Layer_PasteCanvas); - INCLUDE_LAYER(Layer_Polygon); - LAYER_ALIAS(Layer_Polygon,"Polygon"); - INCLUDE_LAYER(Layer_MotionBlur); + INCLUDE_LAYER(Layer_SolidColor); LAYER_ALIAS(Layer_SolidColor, "solid_color"); + INCLUDE_LAYER(Layer_PasteCanvas); LAYER_ALIAS(Layer_PasteCanvas, "paste_canvas"); + INCLUDE_LAYER(Layer_Polygon); LAYER_ALIAS(Layer_Polygon, "Polygon"); + INCLUDE_LAYER(Layer_MotionBlur); LAYER_ALIAS(Layer_MotionBlur, "motion_blur"); #undef INCLUDE_LAYER @@ -266,7 +265,7 @@ Layer::on_changed() bool Layer::set_param(const String ¶m, const ValueBase &value) { - if(param=="z_depth" && value.same_as(z_depth_)) + if(param=="z_depth" && value.same_type_as(z_depth_)) { z_depth_=value.get(z_depth_); return true; @@ -426,7 +425,7 @@ Layer::get_version()const } bool -Layer::set_version(const String &ver) +Layer::set_version(const String &/*ver*/) { return false; } @@ -467,7 +466,7 @@ Layer::hit_check(synfig::Context context, const synfig::Point &pos)const ** is anything but accelerated... */ bool -Layer::accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb) const +Layer::accelerated_render(Context context,Surface *surface,int /*quality*/, const RendDesc &renddesc, ProgressCallback *cb) const { handle target=surface_target(surface); if(!target)