[Bf-blender-cvs] [c9d54e2] alembic_basic_io: Fix compile errors.

Kévin Dietrich noreply at git.blender.org
Thu Jun 30 03:12:18 CEST 2016


Commit: c9d54e2895bc8c69b38d1f7a57fa3b5ef788407e
Author: Kévin Dietrich
Date:   Thu Jun 30 02:37:53 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rBc9d54e2895bc8c69b38d1f7a57fa3b5ef788407e

Fix compile errors.

===================================================================

M	source/blender/alembic/intern/abc_nurbs.cc
M	source/blender/blenloader/intern/writefile.c

===================================================================

diff --git a/source/blender/alembic/intern/abc_nurbs.cc b/source/blender/alembic/intern/abc_nurbs.cc
index edae386..9c67eb3 100644
--- a/source/blender/alembic/intern/abc_nurbs.cc
+++ b/source/blender/alembic/intern/abc_nurbs.cc
@@ -199,7 +199,7 @@ bool AbcNurbsReader::valid() const
 		return false;
 	}
 
-	std::vector< std::pair<INuPatchSchema, IObject> >::iterator it;
+	std::vector< std::pair<INuPatchSchema, IObject> >::const_iterator it;
 	for (it = m_schemas.begin(); it != m_schemas.end(); ++it) {
 		const INuPatchSchema &schema = it->first;
 
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 1b1154b..804ede9 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -3863,7 +3863,7 @@ static void write_cachefiles(WriteData *wd, ListBase *idbase)
 
 	for (cache_file = idbase->first; cache_file; cache_file = cache_file->id.next) {
 		if (cache_file->id.us > 0 || wd->current) {
-			writestruct(wd, ID_CF, "CacheFile", 1, cache_file);
+			writestruct(wd, ID_CF, CacheFile, 1, cache_file);
 
 			if (cache_file->adt) {
 				write_animdata(wd, cache_file->adt);




More information about the Bf-blender-cvs mailing list