OSDN Git Service
(root)
/
psychlops
/
silverlight.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.sourceforge.jp:/gitroot/psychlops/silverlight
[psychlops/silverlight.git]
/
dev4
/
psychlops
/
core
/
graphic
/
module.cs
diff --git
a/dev4/psychlops/core/graphic/module.cs
b/dev4/psychlops/core/graphic/module.cs
index
6adecfd
..
e55a779
100644
(file)
--- a/
dev4/psychlops/core/graphic/module.cs
+++ b/
dev4/psychlops/core/graphic/module.cs
@@
-120,9
+120,10
@@
namespace Psychlops
yellow = new Color(1, 1, 0, 1),
\r
magenta = new Color(1, 0, 1, 1),
\r
cyan = new Color(0, 1, 1, 1),
\r
yellow = new Color(1, 1, 0, 1),
\r
magenta = new Color(1, 0, 1, 1),
\r
cyan = new Color(0, 1, 1, 1),
\r
- white = new Color(1, 1, 1, 1),
\r
gray = new Color(.5, .5, .5, 1),
\r
gray = new Color(.5, .5, .5, 1),
\r
- null_color = new Color(0, 0, 0, 0);
\r
+ white = new Color(1, 1, 1, 1),
\r
+ null_color = new Color(0, 0, 0, 0),
\r
+ transparent = new Color(0, 0, 0, 0);
\r
\r
}
\r
\r
\r
}
\r
\r