Merge pull request #18717 from Mugen87/dev41

Editor: Fix geometry sidebar.

editor/js/Sidebar.Geometry.js

@@ -247,7 +247,14 @@ var SidebarGeometry = function ( editor ) {
 
 	}
 
-	signals.objectSelected.add( build );
+	signals.objectSelected.add( function () {
+
+		currentGeometryType = null;
+
+		build();
+
+	} );
+
 	signals.geometryChanged.add( build );
 
 	return container;