git-svn-id: https://farcry.jira.com/svn/FC/trunk@12863 8f7d33b6-1012-0410-9a5a-bb7ecce9c363
Merged revision(s) 12859 from FC/branches/p630:
re-fix "inheritence fix bad"
........


git-svn-id: https://farcry.jira.com/svn/FC/trunk@12864 8f7d33b6-1012-0410-9a5a-bb7ecce9c363