Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
small typo fix

renamed getNumVertives to getNumVertices.
Merge pull request #378 from MGinshe/patch-1

small typo fix
refactoring: remove not use iosystem.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
update: avoid mesh generation on heap, when the mesh will be empty ( obj-loader ).

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
Fix null check in Q3BSPFileImporter

Reverse the null condition, preventing invalid texture stream
dereferencing. Fixes #380.
Merge pull request #381 from jdduke/fix_bsp_null_check

Fix null check in Q3BSPFileImporter
Fix crash for Blender poly to face conversion without UVs

BlenderBMeshConverter assumes that the BMesh has UVs, but that is not
always the case. Handle the non-UV case by only adding a T face when
UVs are present.
Merge pull request #383 from jdduke/blender_fix_uv_conversion

Fix crash for Blender poly to face conversion without UVs
Logging and ignores
Fix gcc warnings. (initialization order)
Fix non-BMesh containing .blend import

BlenderBMeshConverter was erroneously asserting that it contained valid
mesh upon construction. The assertion should only occur when
triangulation is requested, allowing non-BMesh blender meshes to load
properly.

Note that this fixes a number of .blend regression tests that are
currently baselined as failures.
Rebase FBX regression db entries

The FBX importer now properly parses field-of-view tokens. Rebase
only the failing FBX entries to accomodate the fix, also removing
the comment noting the (now incorrect) comment about improper import
of the FOV property.
Merge pull request #387 from Kvalme/master

Fix gcc warnings. (initialization order)
Merge pull request #385 from jdduke/fix_blend_and_rebase_regression_tests

Fix non-BMesh-containing .blend import
Merge pull request #386 from jdduke/rebase_fbx_fov

Rebase FBX regression db entries
Merge branch 'master' into trunk