Merge branch 'OSGeo:main' into master

a0x8o · Sep 10, 2023 · 55f223a · 55f223a
2 parents 748c0d1 + 738b29c
commit 55f223a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 165 deletions.
diff --git a/.github/workflows/build_centos.sh b/.github/workflows/build_centos.sh
diff --git a/.github/workflows/centos.yml b/.github/workflows/centos.yml
diff --git a/.github/workflows/yum.txt b/.github/workflows/yum.txt
diff --git a/README.md b/README.md
@@ -6,7 +6,6 @@
 [![General linting](https://github.com/OSGeo/grass/workflows/General%20linting/badge.svg)](https://github.com/OSGeo/grass/actions?query=workflow%3A%22General+linting%22)
 [![Ubuntu](https://github.com/OSGeo/grass/workflows/Ubuntu/badge.svg)](https://github.com/OSGeo/grass/actions?query=workflow%3AUbuntu)
 [![OSGeo4W](https://github.com/OSGeo/grass/workflows/OSGeo4W/badge.svg)](https://github.com/OSGeo/grass/actions?query=workflow%3AOSGeo4W)
-[![CentOS](https://github.com/OSGeo/grass/workflows/CentOS/badge.svg)](https://github.com/OSGeo/grass/actions?query=workflow%3ACentOS)
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.5176030.svg)](https://doi.org/10.5281/zenodo.5176030)
 [![Join the chat at https://gitter.im/grassgis/community](https://badges.gitter.im/grassgis/community.svg)](https://gitter.im/grassgis/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 

diff --git a/misc/m.nviz.image/surface.c b/misc/m.nviz.image/surface.c
@@ -99,14 +99,14 @@ int load_rasters(const struct GParams *params, nv_data *data)
 
     for (i = 0; i < nsurfs; i++) {
         id = surf_list[i];
-        mapset = G_find_raster2(params->color_map->answers[i], "");
-        if (mapset == NULL) {
-            G_fatal_error(_("Raster map <%s> not found"),
-                          params->color_map->answers[i]);
-        }
         /* color */
         /* check for color map */
         if (i < ncolor_map && strcmp(params->color_map->answers[i], "")) {
+            mapset = G_find_raster2(params->color_map->answers[i], "");
+            if (mapset == NULL) {
+                G_fatal_error(_("Raster map <%s> not found"),
+                              params->color_map->answers[i]);
+            }
             Nviz_set_attr(
                 id, MAP_OBJ_SURF, ATT_COLOR, MAP_ATT,
                 G_fully_qualified_name(params->color_map->answers[i], mapset),