兜森さんが書いた分
Merge remote-tracking branch 'origin/dev/model'

Conflicts:
	framework/sources/interface/graphic/vertex/opengl/gl_vertex_3d.cpp