Merge pull request #8399 from NickHardeman/bugfix-cubemap-regenTexs

ofCubeMap: Android define around regenerateAllTextures()

Author: danoli3

libs/openFrameworks/gl/ofCubeMap.cpp

@@ -855,7 +855,7 @@ void ofCubeMap::_createIrradianceMap(GLuint aSrcCubeFid, bool aBMakeCache, const
 	std::vector<glm::mat4> views = _getViewMatrices( glm::vec3(0,0,0) );
 
 	if( !shaderIrradianceMap.isLoaded() ) {
-		auto isource = ofCubeMapShaders::irriadianceCubeMap();
+		auto isource = ofCubeMapShaders::irradianceCubeMap();
 		shaderIrradianceMap.setupShaderFromSource(GL_VERTEX_SHADER, isource.vertShader );
 		shaderIrradianceMap.setupShaderFromSource(GL_FRAGMENT_SHADER, isource.fragShader );
 		shaderIrradianceMap.bindDefaults();

libs/openFrameworks/gl/ofCubeMap.h

@@ -63,7 +63,9 @@ class ofCubeMap {
 	static bool hasActiveCubeMap();
 	static std::shared_ptr<ofCubeMap::Data> getActiveData();
 	static void clearTextureData(std::shared_ptr<ofCubeMap::Data> adata);
+	#ifdef TARGET_ANDROID
 	static void regenerateAllTextures();
+	#endif
 	static const ofTexture & getBrdfLutTexture();
 
 	ofCubeMap();

libs/openFrameworks/gl/ofCubeMapShaders.h

@@ -103,7 +103,7 @@ class ofCubeMapShaders {
 		return rsource;
 	}
 
-	static ShaderSource irriadianceCubeMap() {
+	static ShaderSource irradianceCubeMap() {
 		ShaderSource rsource;
 		rsource.vertShader = defaultVertShader();