|
 |
5c26d5d |
diff -Naur k3d-source-0.8.0.2.orig/k3dsdk/data.h k3d-source-0.8.0.2/k3dsdk/data.h
|
|
|
5c26d5d |
--- k3d-source-0.8.0.2.orig/k3dsdk/data.h 2010-07-03 04:27:46.000000000 +0200
|
|
|
5c26d5d |
+++ k3d-source-0.8.0.2/k3dsdk/data.h 2012-01-05 06:34:18.127223587 +0100
|
|
|
5c26d5d |
@@ -865,7 +865,7 @@
|
|
|
5c26d5d |
|
|
|
5c26d5d |
try
|
|
|
5c26d5d |
{
|
|
|
5c26d5d |
- set_value(boost::lexical_cast<value_t>(*new_value), Hint);
|
|
|
5c26d5d |
+ this->set_value(boost::lexical_cast<value_t>(*new_value), Hint);
|
|
|
5c26d5d |
return true;
|
|
|
5c26d5d |
}
|
|
|
5c26d5d |
catch(...)
|
|
|
5c26d5d |
@@ -1011,7 +1011,7 @@
|
|
|
5c26d5d |
|
|
|
5c26d5d |
try
|
|
|
5c26d5d |
{
|
|
|
5c26d5d |
- set_value(boost::lexical_cast<value_t>(*new_value), Hint);
|
|
|
5c26d5d |
+ this->set_value(boost::lexical_cast<value_t>(*new_value), Hint);
|
|
|
5c26d5d |
return true;
|
|
|
5c26d5d |
}
|
|
|
5c26d5d |
catch(...)
|
|
|
5c26d5d |
@@ -1146,7 +1146,7 @@
|
|
|
5c26d5d |
if(!new_value)
|
|
|
5c26d5d |
return false;
|
|
|
5c26d5d |
|
|
|
5c26d5d |
- set_value(*new_value, Hint);
|
|
|
5c26d5d |
+ this->set_value(*new_value, Hint);
|
|
|
5c26d5d |
return true;
|
|
|
5c26d5d |
}
|
|
|
5c26d5d |
|
|
|
5c26d5d |
@@ -1671,7 +1671,7 @@
|
|
|
5c26d5d |
/// This little bit of magic makes it possible for base classes (such as node_storage) to update their own values while observing the correct undo policy
|
|
|
5c26d5d |
void internal_set_value(const value_t& Value, ihint* const Hint)
|
|
|
5c26d5d |
{
|
|
|
5c26d5d |
- set_value(Value, Hint);
|
|
|
5c26d5d |
+ this->set_value(Value, Hint);
|
|
|
5c26d5d |
}
|
|
|
5c26d5d |
};
|
|
|
5c26d5d |
|
|
|
5c26d5d |
diff -Naur k3d-source-0.8.0.2.orig/modules/animation/interpolator.h k3d-source-0.8.0.2/modules/animation/interpolator.h
|
|
|
5c26d5d |
--- k3d-source-0.8.0.2.orig/modules/animation/interpolator.h 2010-07-03 04:27:55.000000000 +0200
|
|
|
5c26d5d |
+++ k3d-source-0.8.0.2/modules/animation/interpolator.h 2012-01-05 06:05:38.400985430 +0100
|
|
|
5c26d5d |
@@ -92,7 +92,7 @@
|
|
|
5c26d5d |
{
|
|
|
5c26d5d |
time_t t_lower, t_upper;
|
|
|
5c26d5d |
value_t v_lower, v_upper;
|
|
|
5c26d5d |
- get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper);
|
|
|
5c26d5d |
+ this->get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper);
|
|
|
5c26d5d |
return lerp(t_lower, t_upper, v_lower, v_upper, Time);
|
|
|
5c26d5d |
}
|
|
|
5c26d5d |
protected:
|
|
|
5c26d5d |
@@ -116,7 +116,7 @@
|
|
|
5c26d5d |
{
|
|
|
5c26d5d |
time_t t_lower, t_upper;
|
|
|
5c26d5d |
value_t v_lower, v_upper;
|
|
|
5c26d5d |
- get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper);
|
|
|
5c26d5d |
+ this->get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper);
|
|
|
5c26d5d |
return lerp(t_lower, t_upper, v_lower, v_upper, Time);
|
|
|
5c26d5d |
}
|
|
|
5c26d5d |
protected:
|