projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'nikitakit_master'
[synfig.git]
/
synfig-studio
/
src
/
gui
/
duckmatic.cpp
diff --git
a/synfig-studio/src/gui/duckmatic.cpp
b/synfig-studio/src/gui/duckmatic.cpp
index
cece9fb
..
adf95f6
100644
(file)
--- a/
synfig-studio/src/gui/duckmatic.cpp
+++ b/
synfig-studio/src/gui/duckmatic.cpp
@@
-1488,7
+1488,7
@@
Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
return false;
etl::handle<Duck> vertex_duck(last_duck());
vertex_duck->set_type(Duck::TYPE_VERTEX);
return false;
etl::handle<Duck> vertex_duck(last_duck());
vertex_duck->set_type(Duck::TYPE_VERTEX);
- if(!add_to_ducks(synfigapp::ValueDesc(value_node,4),canvas_view,transform_stack))
+ if(!add_to_ducks(synfigapp::ValueDesc(value_node,4
,-TANGENT_HANDLE_SCALE
),canvas_view,transform_stack))
return false;
etl::handle<Duck> t1_duck(last_duck());
return false;
etl::handle<Duck> t1_duck(last_duck());
@@
-1501,7
+1501,7
@@
Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
// If the tangents are split
if((*value_node->get_link("split"))(get_time()).get(bool()))
{
// If the tangents are split
if((*value_node->get_link("split"))(get_time()).get(bool()))
{
- if(!add_to_ducks(synfigapp::ValueDesc(value_node,5),canvas_view,transform_stack))
+ if(!add_to_ducks(synfigapp::ValueDesc(value_node,5
,TANGENT_HANDLE_SCALE
),canvas_view,transform_stack))
return false;
t2_duck=last_duck();
t2_duck->set_origin(vertex_duck);
return false;
t2_duck=last_duck();
t2_duck->set_origin(vertex_duck);
@@
-1510,7
+1510,7
@@
Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
}
else
{
}
else
{
- if(!add_to_ducks(synfigapp::ValueDesc(value_node,4),canvas_view,transform_stack))
+ if(!add_to_ducks(synfigapp::ValueDesc(value_node,4
,TANGENT_HANDLE_SCALE
),canvas_view,transform_stack))
return false;
t2_duck=last_duck();
t2_duck->set_origin(vertex_duck);
return false;
t2_duck=last_duck();
t2_duck->set_origin(vertex_duck);
@@
-1665,7
+1665,7
@@
Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
// Add the tangent1 duck
if(composite_vertex_value_node)
{
// Add the tangent1 duck
if(composite_vertex_value_node)
{
- if(!add_to_ducks(synfigapp::ValueDesc(composite_vertex_value_node,4),canvas_view,transform_stack))
+ if(!add_to_ducks(synfigapp::ValueDesc(composite_vertex_value_node,4
,-TANGENT_BEZIER_SCALE
),canvas_view,transform_stack))
return false;
tduck=last_duck();
}
return false;
tduck=last_duck();
}
@@
-1722,7
+1722,7
@@
Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
if(composite_vertex_value_node)
{
int i=bline_point.get_split_tangent_flag()?5:4;
if(composite_vertex_value_node)
{
int i=bline_point.get_split_tangent_flag()?5:4;
- if(!add_to_ducks(synfigapp::ValueDesc(composite_vertex_value_node,i),canvas_view,transform_stack,0,2))
+ if(!add_to_ducks(synfigapp::ValueDesc(composite_vertex_value_node,i
,TANGENT_BEZIER_SCALE
),canvas_view,transform_stack,0,2))
return false;
tduck=last_duck();
}
return false;
tduck=last_duck();
}