diff options
| author | Marius Kintel <marius@kintel.net> | 2012-01-04 22:29:08 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-01-04 22:29:08 (GMT) |
| commit | 52dfffd97ba49b603b4814d843cd9be08d040364 (patch) | |
| tree | 044c93d19aa38ac24822a241babbece7425bfbb2 /src/colornode.h | |
| parent | 0be212e75d73644b1cff8291a4b6a6fe0098b942 (diff) | |
| parent | ba8aa515d14cf270c9d0fdf50b4c7c55b3c416a8 (diff) | |
Merge branch 'master' into threading
Conflicts:
RELEASE_NOTES
Diffstat (limited to 'src/colornode.h')
| -rw-r--r-- | src/colornode.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/colornode.h b/src/colornode.h index b41e2a9..9323638 100644 --- a/src/colornode.h +++ b/src/colornode.h @@ -3,6 +3,7 @@ #include "node.h" #include "visitor.h" +#include "linalg.h" class ColorNode : public AbstractNode { @@ -14,7 +15,7 @@ public: virtual std::string toString() const; virtual std::string name() const; - double color[4]; + Color4f color; }; #endif |