gobj: don't strip .bam textures that contain only a clear color

rdb · rdb · commit 707b4fb86642 · 2020-03-18T17:51:39.000+01:00
Second part of the fix for panda3d#844
diff --git a/panda/src/gobj/texture.cxx b/panda/src/gobj/texture.cxx
@@ -9951,9 +9951,11 @@ do_write_datagram_header(CData *cdata, BamWriter *manager, Datagram &me, bool &h
       << "Unsupported bam-texture-mode: " << (int)file_texture_mode << "\n";
   }
 
-  if (filename.empty() && do_has_bam_rawdata(cdata)) {
-    // If we don't have a filename, we have to store rawdata anyway.
-    has_rawdata = true;
+  if (filename.empty()) {
+    if (do_has_bam_rawdata(cdata) || cdata->_has_clear_color) {
+      // If we don't have a filename, we have to store rawdata anyway.
+      has_rawdata = true;
+    }
   }
 
   me.add_string(get_name());

Original file line number	Diff line number	Diff line change
`@@ -9951,9 +9951,11 @@ do_write_datagram_header(CData cdata, BamWriter manager, Datagram &me, bool &h`
`9951`	`9951`	`<< "Unsupported bam-texture-mode: " << (int)file_texture_mode << "\n";`
`9952`	`9952`	`}`
`9953`	`9953`
`9954`		`- if (filename.empty() && do_has_bam_rawdata(cdata)) {`
`9955`		`- // If we don't have a filename, we have to store rawdata anyway.`
`9956`		`- has_rawdata = true;`
	`9954`	`+ if (filename.empty()) {`
	`9955`	`+ if (do_has_bam_rawdata(cdata) \|\| cdata->_has_clear_color) {`
	`9956`	`+ // If we don't have a filename, we have to store rawdata anyway.`
	`9957`	`+ has_rawdata = true;`
	`9958`	`+ }`
`9957`	`9959`	`}`
`9958`	`9960`
`9959`	`9961`	`me.add_string(get_name());`