Merge "Fix shader compile error fix in npatch visual" into devel/master