Remove core changes

Author: danoli3

libs/openFrameworks/3d/ofMesh.inl

@@ -814,7 +814,7 @@ template<class V, class N, class C, class T>
 void ofMesh_<V,N,C,T>::setVertex(ofIndexType index, const V& v){
 	vertices[index] = v;
 	bVertsChanged = true;
-	if(usingIndices()) bIndicesChanged = true;
+	bIndicesChanged = true;
 	bFacesDirty = true;
 }
 
@@ -879,7 +879,6 @@ void ofMesh_<V,N,C,T>::setupIndicesAuto(){
 template<class V, class N, class C, class T>
 void ofMesh_<V,N,C,T>::clearVertices(){
 	vertices.clear();
-	if(usingIndices()) bIndicesChanged = true;
 	bVertsChanged=true;
 }
 

libs/openFrameworks/app/ofAppRunner.cpp

@@ -239,9 +239,7 @@ void ofExitCallback(){
 
 
 	// finish every library and subsystem
-#if !defined(NO_URL_LOADER)
 	ofURLFileLoaderShutdown();
-#endif
 
 	#ifndef TARGET_NO_SOUND
 		//------------------------

libs/openFrameworks/graphics/ofImage.cpp

@@ -224,11 +224,9 @@ static bool loadImage(ofPixels_<PixelType> & pix, const of::filesystem::path & _
 	std::string scheme(uri.scheme.first, uri.scheme.afterLast);
 	uriFreeUriMembersA(&uri);
 
-#if !defined(NO_URL_LOADER)
 	if(scheme == "http" || scheme == "https"){
 		return ofLoadImage(pix, ofLoadURL(ofPathToString(_fileName)).data);
 	}
-#endif
 
 
 	bool bLoaded = false;

libs/openFrameworks/graphics/ofPixels.cpp

@@ -168,7 +168,7 @@ static size_t channelsFromPixelFormat(ofPixelFormat format){
 		return 2;
 		break;
 	default:
-		ofLogError("ofPixels") << "format doesn't support channels";
+		ofLog(OF_LOG_ERROR,"ofPixels: format doesn't support channels");
 		return 1;
 	}
 }
@@ -185,7 +185,7 @@ static ofPixelFormat ofPixelFormatFromImageType(ofImageType type){
 		return OF_PIXELS_RGBA;
 		break;
 	default:
-		ofLogError("ofPixels") << "image type not supported";
+		ofLog(OF_LOG_ERROR,"ofPixels: image type not supported");
 		return OF_PIXELS_UNKNOWN;
 	}
 }
@@ -207,7 +207,7 @@ static ofImageType ofImageTypeFromPixelFormat(ofPixelFormat pixelFormat){
 	case OF_PIXELS_UNKNOWN:
 		return OF_IMAGE_UNDEFINED;
 	default:
-		ofLogError("ofPixels") << "image type not supported";
+		ofLog(OF_LOG_ERROR,"ofPixels: image type not supported");
 		return OF_IMAGE_UNDEFINED;
 	}
 }

libs/openFrameworks/utils/ofURLFileLoader.h

@@ -5,7 +5,6 @@
 #include "ofFileUtils.h"
 #include <map>
 
-#if !defined(NO_URL_LOADER)
 class ofHttpResponse;
 
 /// \class ofHttpRequest
@@ -259,5 +258,3 @@ class ofBaseURLFileLoader {
 	/// \return unique id of the active HTTP request
 	virtual int handleRequestAsync(const ofHttpRequest & request) = 0;
 };
-
-#endif