X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-property.cc;h=9120aefdf29939b5f16c6e60fb7218fdcafeba68;hb=7404fd9d0d16a12b5f065268f5a6196024496aca;hp=db16f2a54af248e4818f6cb7d9188ed3d28a2972;hpb=5b1f3adfe5e3561eaa0f9440e0697054084b7107;p=lilypond.git diff --git a/lily/grob-property.cc b/lily/grob-property.cc index db16f2a54a..9120aefdf2 100644 --- a/lily/grob-property.cc +++ b/lily/grob-property.cc @@ -170,7 +170,7 @@ Grob::internal_get_property (SCM sym) const { programming_error (to_string ("cyclic dependency: calculation-in-progress encountered for #'%s (%s)", ly_symbol2string (sym).c_str (), - name ().c_str ())); + name ().c_str ()));//assert (1==0); if (debug_property_callbacks) { message ("backtrace: "); @@ -241,11 +241,6 @@ Grob::try_callback_on_alist (SCM *alist, SCM sym, SCM proc) grob_property_callback_stack = scm_cdr (grob_property_callback_stack); #endif - /* - If the function returns SCM_UNSPECIFIED, we assume the - property has been set with an explicit set_property () - call. - */ if (value == SCM_UNSPECIFIED) { value = get_property_data (sym);