[Bf-blender-cvs] [3dd78fc] alembic: quiet warnings (increase int size for bitshift)

Campbell Barton noreply at git.blender.org
Thu Mar 26 18:32:57 CET 2015


Commit: 3dd78fc48f1700e7cb077b5ba8794c57f03dccca
Author: Campbell Barton
Date:   Fri Mar 27 04:32:08 2015 +1100
Branches: alembic
https://developer.blender.org/rB3dd78fc48f1700e7cb077b5ba8794c57f03dccca

quiet warnings (increase int size for bitshift)

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

M	source/blender/pointcache/alembic/abc_customdata.cpp

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

diff --git a/source/blender/pointcache/alembic/abc_customdata.cpp b/source/blender/pointcache/alembic/abc_customdata.cpp
index 9f197f5..6b5a7c5 100644
--- a/source/blender/pointcache/alembic/abc_customdata.cpp
+++ b/source/blender/pointcache/alembic/abc_customdata.cpp
@@ -501,7 +501,7 @@ void CustomDataWriter::write_sample(CustomData *cdata, int num_data, OCompoundPr
 	m_props = add_compound_property<OCompoundProperty>(m_name, parent);
 	
 	for (int type = 0; type < CD_NUMTYPES; ++type) {
-		CustomDataMask mask = (1 << type);
+		CustomDataMask mask = (1ull << type);
 		/* only use specified types */
 		if (!(mask & m_cdmask))
 			continue;
@@ -547,7 +547,7 @@ PTCReadSampleResult CustomDataReader::read_sample(const ISampleSelector &ss, Cus
 	m_props = add_compound_property<ICompoundProperty>(m_name, parent);
 	
 	for (int type = 0; type < CD_NUMTYPES; ++type) {
-		CustomDataMask mask = (1 << type);
+		CustomDataMask mask = (1ull << type);
 		/* only use specified types */
 		if (!(mask & m_cdmask))
 			continue;




More information about the Bf-blender-cvs mailing list