Create geometry forcibly even if adaptor invalid 23/319023/1
authorEunki, Hong <eunkiki.hong@samsung.com>
Fri, 11 Oct 2024 02:13:41 +0000 (11:13 +0900)
committerEunki Hong <eunkiki.hong@samsung.com>
Sat, 12 Oct 2024 20:42:30 +0000 (05:42 +0900)
A lots of visuals create new geometry even if adaptor invalid.
But only for ImageVisual could return empty geometry handle.

It might make some problem at app terminate case.

Change-Id: I05f0b1a8e406bcffd675257724cb8cea7a7371be
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>
dali-toolkit/internal/visuals/image/image-visual.cpp

index ce90d886114505dd5f68183157a45c5cdf462328..ed3383cdcd61d9713030cf64e2eae223b452d587 100644 (file)
@@ -1558,14 +1558,15 @@ Geometry ImageVisual::GenerateGeometry(TextureManager::TextureId textureId, bool
           }
         }
       }
-      else if(createForce)
-      {
-        // Create default quad geometry now
-        geometry = CreateGeometry(mFactoryCache, ImageDimensions(1, 1));
-      }
     }
   }
 
+  if(!geometry && createForce)
+  {
+    // Create default quad geometry now
+    geometry = CreateGeometry(mFactoryCache, ImageDimensions(1, 1));
+  }
+
   return geometry;
 }