3 Commits (5030fe8c7e7479f83b58e92f83b5604986b00baf)

Author	SHA1	Message	Date
Andreas Henne	3fc56de33c	Fixed merge conflicts.	2015-08-06 12:04:05 +02:00
Brian Schwind	bcb0ca3efa	Include correct headers, fix string length bug ... - AssimpPCH.h appears to have been removed in #536 - There was a bug where if your model data had a null terminator, AndroidJNIIOSystem would incorrectly calculate the number of bytes it needed to write to the file (since it reads a compressed file from the Android assets, and then writes it to the internalDataPath directory for later importing)	2015-07-20 22:21:17 -04:00
Filip Wasil	7224476ee1	Android JNI asset extraction support (API 9+) ... Signed-off-by: Filip Wasil <filip.wasil@tieto.com>	2014-10-07 16:33:43 +02:00