projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
I forgot to check this in as part of r2271.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
duck.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/duck.cpp
b/synfig-studio/trunk/src/gtkmm/duck.cpp
index
aa1a350
..
6b012a7
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/duck.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/duck.cpp
@@
-112,16
+112,16
@@
Duck::get_data_guid()const
{
if(value_desc_.is_value_node())
return value_desc_.get_value_node()->get_guid();
{
if(value_desc_.is_value_node())
return value_desc_.get_value_node()->get_guid();
- return GUID::hasher(get_name());
+ return
synfig::
GUID::hasher(get_name());
}
void
Duck::set_name(const synfig::String &x)
{
name=x;
}
void
Duck::set_name(const synfig::String &x)
{
name=x;
- if(guid_==GUID::zero())
+ if(guid_==
synfig::
GUID::zero())
{
{
- guid_=GUID::hasher(name);
+ guid_=
synfig::
GUID::hasher(name);
}
}
}
}
@@
-208,7
+208,9
@@
Duck::set_sub_trans_point(const synfig::Point &x)
int old_halves = round_to_int(Angle::deg(rotations).get()/180);
rotations += change;
int new_halves = round_to_int(Angle::deg(rotations).get()/180);
int old_halves = round_to_int(Angle::deg(rotations).get()/180);
rotations += change;
int new_halves = round_to_int(Angle::deg(rotations).get()/180);
- if (old_halves != new_halves)
+ if (old_halves != new_halves &&
+ (new_halves > 1 || new_halves < -1 ||
+ old_halves > 1 || old_halves < -1))
synfig::info("rotation: %.2f turns", new_halves/2.0);
}
else
synfig::info("rotation: %.2f turns", new_halves/2.0);
}
else