Merge pull request #30 from mfoo/master

Two one-line changes to libRocket

Build/CMakeLists.txt

@@ -21,7 +21,7 @@ set(LIBROCKET_VERSION_PATCH 1)
 set(PROJECT_VERSION ${LIBROCKET_VERSION_MAJOR}.${LIBROCKET_VERSION_MINOR}.${LIBROCKET_VERSION_PATCH})
 
 # Search in the 'cmake' directory for additional CMake modules.
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
 set(CMAKE_DEBUG_POSTFIX  "_d")
 

Samples/shell/src/ShellRenderInterfaceOpenGL.cpp

@@ -41,6 +41,7 @@ void ShellRenderInterfaceOpenGL::RenderGeometry(Rocket::Core::Vertex* vertices,
 	glTranslatef(translation.x, translation.y, 0);
 
 	glVertexPointer(2, GL_FLOAT, sizeof(Rocket::Core::Vertex), &vertices[0].position);
+	glEnableClientState(GL_COLOR_ARRAY);
 	glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(Rocket::Core::Vertex), &vertices[0].colour);
 
 	if (!texture)