fix cg draw, fill state color set
Merge remote-tracking branch 'origin/master'