svn merge -r15549:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender

- mainly to fix the free() crash with the file selector

1 files changed, 16 insertions, 0 deletions

diff --git a/intern/container/CTR_TaggedIndex.h b/intern/container/CTR_TaggedIndex.h
index 7a7bd85e890..68d2536c879 100644
--- a/intern/container/CTR_TaggedIndex.h
+++ b/intern/container/CTR_TaggedIndex.h
@@ -93,6 +93,16 @@ public:
 	}
 
 
+#if defined(_WIN64)
+	CTR_TaggedIndex(
+		const unsigned __int64 val
+	) :
+		m_val ( ((unsigned __int64)val & index_mask)
+				| ( (empty_tag << tag_shift)
+					& (~index_mask) ) ) {
+	}
+#endif
+
 	CTR_TaggedIndex(
 		const CTR_TaggedIndex &my_index
 	):
@@ -124,6 +134,12 @@ public:
 		return (long int)(m_val & index_mask);
 	}
 
+#if defined(_WIN64)
+	operator unsigned __int64 () const {
+			return (unsigned __int64)(m_val & index_mask);
+		}
+#endif
+
 		bool
 	IsEmpty(
 	) const {