projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use Color::is_straight(). Also, re-enable the optimization for straight blending...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
preview.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/preview.cpp
b/synfig-studio/trunk/src/gtkmm/preview.cpp
index
4f5bef1
..
74a0f8f
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/preview.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/preview.cpp
@@
-701,7
+701,7
@@
void studio::Widget_Preview::disconnect_preview(Preview *prev)
}
}
}
}
-void studio::Widget_Preview::set_preview(
handle<Preview>
prev)
+void studio::Widget_Preview::set_preview(
etl::handle<Preview>
prev)
{
preview = prev;
{
preview = prev;
@@
-861,15
+861,17
@@
void studio::Widget_Preview::repreview()
void studio::Widget_Preview::stoprender()
{
void studio::Widget_Preview::stoprender()
{
- // don't crash if the render has already been stopped
- if (!preview->renderer)
- return;
-
if(preview)
if(preview)
+ {
+ // don't crash if the render has already been stopped
+ if (!preview->renderer)
+ return;
+
if (preview->renderer->updating)
preview->renderer->stop();
else
preview->renderer.detach();
if (preview->renderer->updating)
preview->renderer->stop();
else
preview->renderer.detach();
+ }
}
void studio::Widget_Preview::eraseall()
}
void studio::Widget_Preview::eraseall()