3 files changed, 33 insertions, 8 deletions

diff --git a/servers/camera_server.cpp b/servers/camera_server.cpp
index 0f93221072..6912a37fc5 100644
--- a/servers/camera_server.cpp
+++ b/servers/camera_server.cpp
@@ -35,6 +35,8 @@
 ////////////////////////////////////////////////////////
 // CameraServer
 
+CameraServer::CreateFunc CameraServer::create_func = NULL;
+
 void CameraServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_feed", "index"), &CameraServer::get_feed);
 	ClassDB::bind_method(D_METHOD("get_feed_count"), &CameraServer::get_feed_count);
diff --git a/servers/camera_server.h b/servers/camera_server.h
index c76d046e58..aa10f4dbb9 100644
--- a/servers/camera_server.h
+++ b/servers/camera_server.h
@@ -59,17 +59,36 @@ public:
 		FEED_IMAGES = 2
 	};
 
+	typedef CameraServer *(*CreateFunc)();
+
 private:
 protected:
+	static CreateFunc create_func;
+
 	Vector<Ref<CameraFeed> > feeds;
 
 	static CameraServer *singleton;
 
 	static void _bind_methods();
 
+	template <class T>
+	static CameraServer *_create_builtin() {
+		return memnew(T);
+	}
+
 public:
 	static CameraServer *get_singleton();
 
+	template <class T>
+	static void make_default() {
+		create_func = _create_builtin<T>;
+	}
+
+	static CameraServer *create() {
+		CameraServer *server = create_func ? create_func() : memnew(CameraServer);
+		return server;
+	};
+
 	// Right now we identify our feed by it's ID when it's used in the background.
 	// May see if we can change this to purely relying on CameraFeed objects or by name.
 	int get_free_id();
diff --git a/servers/visual/visual_server_canvas.cpp b/servers/visual/visual_server_canvas.cpp
index efa4311e70..49b5562b6c 100644
--- a/servers/visual/visual_server_canvas.cpp
+++ b/servers/visual/visual_server_canvas.cpp
@@ -75,10 +75,10 @@ void _collect_ysort_children(VisualServerCanvas::Item *p_canvas_item, Transform2
 }
 
 void _mark_ysort_dirty(VisualServerCanvas::Item *ysort_owner, RID_Owner<VisualServerCanvas::Item> &canvas_item_owner) {
-	while (ysort_owner && ysort_owner->sort_y) {
+	do {
 		ysort_owner->ysort_children_count = -1;
 		ysort_owner = canvas_item_owner.owns(ysort_owner->parent) ? canvas_item_owner.getornull(ysort_owner->parent) : NULL;
-	}
+	} while (ysort_owner && ysort_owner->sort_y);
 }
 
 void VisualServerCanvas::_render_canvas_item(Item *p_canvas_item, const Transform2D &p_transform, const Rect2 &p_clip_rect, const Color &p_modulate, int p_z, RasterizerCanvas::Item **z_list, RasterizerCanvas::Item **z_last_list, Item *p_canvas_clip, Item *p_material_owner) {
@@ -362,7 +362,9 @@ void VisualServerCanvas::canvas_item_set_parent(RID p_item, RID p_parent) {
 			Item *item_owner = canvas_item_owner.get(canvas_item->parent);
 			item_owner->child_items.erase(canvas_item);
 
-			_mark_ysort_dirty(item_owner, canvas_item_owner);
+			if (item_owner->sort_y) {
+				_mark_ysort_dirty(item_owner, canvas_item_owner);
+			}
 		}
 
 		canvas_item->parent = RID();
@@ -382,7 +384,9 @@ void VisualServerCanvas::canvas_item_set_parent(RID p_item, RID p_parent) {
 			item_owner->child_items.push_back(canvas_item);
 			item_owner->children_order_dirty = true;
 
-			_mark_ysort_dirty(item_owner, canvas_item_owner);
+			if (item_owner->sort_y) {
+				_mark_ysort_dirty(item_owner, canvas_item_owner);
+			}
 
 		} else {
 
@@ -399,9 +403,7 @@ void VisualServerCanvas::canvas_item_set_visible(RID p_item, bool p_visible) {
 
 	canvas_item->visible = p_visible;
 
-	if (canvas_item->parent.is_valid() && canvas_item_owner.owns(canvas_item->parent)) {
-		_mark_ysort_dirty(canvas_item_owner.get(canvas_item->parent), canvas_item_owner);
-	}
+	_mark_ysort_dirty(canvas_item, canvas_item_owner);
 }
 void VisualServerCanvas::canvas_item_set_light_mask(RID p_item, int p_mask) {
 
@@ -1382,7 +1384,9 @@ bool VisualServerCanvas::free(RID p_rid) {
 				Item *item_owner = canvas_item_owner.get(canvas_item->parent);
 				item_owner->child_items.erase(canvas_item);
 
-				_mark_ysort_dirty(item_owner, canvas_item_owner);
+				if (item_owner->sort_y) {
+					_mark_ysort_dirty(item_owner, canvas_item_owner);
+				}
 			}
 		}