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, make sure we set the blend method of the newly encap...
[synfig.git]
/
ETL
/
trunk
/
ETL
/
_smach.h
diff --git
a/ETL/trunk/ETL/_smach.h
b/ETL/trunk/ETL/_smach.h
index
4e065a8
..
992d09b
100644
(file)
--- a/
ETL/trunk/ETL/_smach.h
+++ b/
ETL/trunk/ETL/_smach.h
@@
-38,7
+38,7
@@
#ifdef _MSC_VER
#pragma warning (disable:4786)
#ifdef _MSC_VER
#pragma warning (disable:4786)
-#pragma warning (disable:4290) // MSVC6 doesnt like function declarations with exception specs
+#pragma warning (disable:4290) // MSVC6 doesn
'
t like function declarations with exception specs
#endif
//#define ETL_MUTEX_LOCK() _mutex::lock lock(mutex)
#endif
//#define ETL_MUTEX_LOCK() _mutex::lock lock(mutex)
@@
-338,7
+338,7
@@
public:
const state_base *prev_state=default_state;
// If we are already in a state, leave it and
const state_base *prev_state=default_state;
// If we are already in a state, leave it and
- // colapse the state stack
+ // col
l
apse the state stack
if(default_state)
default_state->leave_state(default_context);
if(default_state)
default_state->leave_state(default_context);
@@
-381,7
+381,7
@@
public:
while(states_on_stack) pop_state();
// If we are not in a state, then I guess
while(states_on_stack) pop_state();
// If we are not in a state, then I guess
- // we were succesful.
+ // we were succes
s
ful.
if(!curr_state)
return true;
if(!curr_state)
return true;
@@
-391,7
+391,7
@@
public:
const state_base* old_state=curr_state;
void *old_context=state_context;
const state_base* old_state=curr_state;
void *old_context=state_context;
- // Clear out the current state and it
'
s state_context
+ // Clear out the current state and its state_context
curr_state=0;state_context=0;
// Leave the state
curr_state=0;state_context=0;
// Leave the state
@@
-416,7
+416,7
@@
public:
const state_base *prev_state=curr_state;
// If we are already in a state, leave it and
const state_base *prev_state=curr_state;
// If we are already in a state, leave it and
- // colapse the state stack
+ // col
l
apse the state stack
if(curr_state)
egress();
if(curr_state)
egress();