diff --git a/change_log.txt b/change_log.txt index ceae0eea5ee3c401ca323b9d2909382dc7a6be52..dbb1338812bade5bf9752d9e386eaa4632198c76 100644 --- a/change_log.txt +++ b/change_log.txt @@ -636,4 +636,7 @@ * AsQuaternion is now a const member function (contributed by Dragongeo2). * Some math operators for TexCoord and Color4 (contributed by Dragongeo2). - + * Make base_type field public (requested by DragoonWraith). + * Store block number in NiObject when reading a nif file (requested by DragoonWraith). + * Added cmake build script. + * GetTexture() now returns a TexDesc reference (requested by DragoonWraith). diff --git a/include/obj/NiTexturingProperty.h b/include/obj/NiTexturingProperty.h index b3466bd907efb0901ce659d02e9b1638296e9aac..cff2003829913cbc8d089165e3a8ec24cc88039f 100644 --- a/include/obj/NiTexturingProperty.h +++ b/include/obj/NiTexturingProperty.h @@ -105,7 +105,7 @@ public: * \param n The slot number of the texture to get the texture description of. This is a positive zero based index that must be less than the value returned by NiTexturingProperty::GetTextureCount. * \sa NiTexturingProperty::SetTexture, TexType */ - NIFLIB_API TexDesc GetTexture( int n ) const; + NIFLIB_API TexDesc & GetTexture( int n ); /*! * Checks whether a particular texture type is being used diff --git a/src/obj/NiTexturingProperty.cpp b/src/obj/NiTexturingProperty.cpp index 3b4c860631ce96b626102e165eaed80cdbdbe162..f3528550c0a898a3a2e62041e1e444c088521ee2 100644 --- a/src/obj/NiTexturingProperty.cpp +++ b/src/obj/NiTexturingProperty.cpp @@ -1517,7 +1517,7 @@ int NiTexturingProperty::GetShaderTextureCount() const { return int(shaderTextures.size()); } -TexDesc NiTexturingProperty::GetTexture( int n ) const { +TexDesc & NiTexturingProperty::GetTexture( int n ) { //TODO: Create a built in type for this array of textures so it can be a real array again? //Copy the values to the right texture switch (n) {