Merge remote-tracking branch 'origin/patch'

Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/util/MemoryBlockMap.java

@@ -38,7 +38,7 @@ public class MemoryBlockMap implements AddressPixelMap {
 			return;
 		}
 
-		blocks = program.getMemory().getBlocks();
+		blocks = includeBlocks();
 		pixels = new int[blocks.length];
 		long totalSize = 0;
 		for (MemoryBlock block : blocks) {
@@ -50,6 +50,10 @@ public class MemoryBlockMap implements AddressPixelMap {
 		}
 	}
 
+	protected MemoryBlock[] includeBlocks() {
+		return program.getMemory().getBlocks();
+	}
+
 	@Override
 	public Address getAddress(int pixel) {
 		if (pixels == null) {