Skip to content

Commit 479c65e

Browse files
committed
Bugfix combined image not refreshing after first transfer
1 parent 3d88323 commit 479c65e

File tree

4 files changed

+18
-10
lines changed

4 files changed

+18
-10
lines changed
400 Bytes
Binary file not shown.

DazStudioPlugin/real_version.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#pragma once
22

3-
#define PRODUCT_VERSION_STRING "2025 version 1.51"
3+
#define PRODUCT_VERSION_STRING "2025 version 1.52"
44
#define VER_MAJOR 2025
55
#define VER_MINOR 1
6-
#define VER_REV 51
7-
#define VER_BUILD 525
6+
#define VER_REV 52
7+
#define VER_BUILD 527
88

99
#define TOSTRING(x) #x
1010
#define VERSION_STRING TOSTRING(VER_MAJOR) "." TOSTRING(VER_MINOR) "." TOSTRING(VER_REV) "." TOSTRING(VER_BUILD)

PluginData/assign_combined_textures.dsa

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
(function(){
66

77
var sDazTempFolder = App.getTempPath();
8-
// var sMapTransferOutputFolder = sDazTempFolder + "/MapTransfer";
98
var sMapTransferOutputFolder = sDazTempFolder;
109

1110
var sCombinedDiffuseColorImage = sMapTransferOutputFolder + "/combined diffuse texture.png";
@@ -30,10 +29,12 @@ function assignCombinedTextures(oNode) {
3029
var oDiffuseColorProperty = oMaterial.findProperty("Diffuse Color");
3130
if (oDiffuseColorProperty && DzFileInfo(sCombinedDiffuseColorImage).exists()) {
3231
oDiffuseColorProperty.setMap(sCombinedDiffuseColorImage);
32+
oDiffuseColorProperty.getMapValue().refresh();
3333
}
3434
var oNormalMapProperty = oMaterial.findProperty("Normal Map");
3535
if (oNormalMapProperty && DzFileInfo(sCombinedNormalMapImage).exists()) {
3636
oNormalMapProperty.setMap(sCombinedNormalMapImage);
37+
oNormalMapProperty.getMapValue().refresh();
3738
}
3839
var oSpecularMapProperty = oMaterial.findProperty("Specular Lobe 1 Roughness");
3940
if (oSpecularMapProperty &&
@@ -52,6 +53,7 @@ function assignCombinedTextures(oNode) {
5253
) {
5354
print("DEBUG: assign_combined_textures.dsa: dual lobe specular weight for " + oMaterial.name);
5455
oSpecularMapProperty.setMap(sCombinedSpecularMapImage);
56+
oSpecularMapProperty.getMapValue().refresh();
5557
} else {
5658
oSpecularMapProperty = oMaterial.findProperty("Dual Lobe Specular Reflectivity");
5759
if (oSpecularMapProperty &&
@@ -61,12 +63,14 @@ function assignCombinedTextures(oNode) {
6163
) {
6264
print("DEBUG: assign_combined_textures.dsa: dual lobe specular weight for " + oMaterial.name);
6365
oSpecularMapProperty.setMap(sCombinedSpecularMapImage);
66+
oSpecularMapProperty.getMapValue().refresh();
6467
}
6568
}
6669
}
6770
var oMetallicMapProperty = oMaterial.findProperty("Metallic Weight");
6871
if (oMetallicMapProperty && DzFileInfo(sCombinedMetallicMapImage).exists()) {
6972
oMetallicMapProperty.setMap(sCombinedMetallicMapImage);
73+
oMetallicMapProperty.getMapValue().refresh();
7074
}
7175

7276
// switch UV set to the combined texture

PluginData/combine_texture_parts.dsa

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,16 @@
33
(function(){
44

55
var sDazTempFolder = App.getTempPath();
6-
// var sMapTransferOutputFolder = sDazTempFolder + "/MapTransfer";
76
var sMapTransferOutputFolder = sDazTempFolder;
87
var sMapTransferInputFolder = sDazTempFolder + "/textureConvert";
98
var nTextureWidth = 4096;
109
var nTextureHeight = 4096;
1110

11+
var sCombinedDiffuseColorImage = sMapTransferOutputFolder + "/combined diffuse texture.png";
12+
var sCombinedNormalMapImage = sMapTransferOutputFolder + "/combined normal texture.png";
13+
var sCombinedSpecularMapImage = sMapTransferOutputFolder + "/combined specular texture.png";
14+
var sCombinedMetallicMapImage = sMapTransferOutputFolder + "/combined metallic texture.png";
15+
1216
// Template Names: "Diffuse Color.png", "Normal Map.png", "Specular Lob 1 Roughness.png", "Dual Lobe Specular Weight.png"
1317

1418
function alphaCombine(oImageA, oImageB) {
@@ -80,16 +84,16 @@ function main() {
8084

8185
// diffuse color
8286
if (aDiffuseColorImages.length > 0) {
83-
var sOutputFilename = sMapTransferOutputFolder + "/combined diffuse texture.png";
87+
var sOutputFilename = sCombinedDiffuseColorImage;
8488
print("DEBUG: combine_texture_parts.dsa: output = " + sOutputFilename);
8589
var oCombinedImage = combineImages(aDiffuseColorImages);
8690
oCombinedImage.save(sOutputFilename);
87-
oCombinedImage.deleteLater();
91+
oCombinedImage.deleteLater();
8892
}
8993

9094
// normal
9195
if (aNormalMapImages.length > 0) {
92-
var sOutputFilename = sMapTransferOutputFolder + "/combined normal texture.png";
96+
var sOutputFilename = sCombinedNormalMapImage;
9397
print("DEBUG: combine_texture_parts.dsa: output = " + sOutputFilename);
9498
var oCombinedImage = combineImages(aNormalMapImages);
9599
oCombinedImage.save(sOutputFilename);
@@ -98,7 +102,7 @@ function main() {
98102

99103
// specular
100104
if (aSpecularMapImages.length > 0) {
101-
var sOutputFilename = sMapTransferOutputFolder + "/combined specular texture.png";
105+
var sOutputFilename = sCombinedSpecularMapImage;
102106
print("DEBUG: combine_texture_parts.dsa: output = " + sOutputFilename);
103107
var oCombinedImage = combineImages(aSpecularMapImages);
104108
oCombinedImage.save(sOutputFilename);
@@ -107,7 +111,7 @@ function main() {
107111

108112
// metallic
109113
if (aMetallicMapImages.length > 0) {
110-
var sOutputFilename = sMapTransferOutputFolder + "/combined metallic texture.png";
114+
var sOutputFilename = sCombinedMetallicMapImage;
111115
print("DEBUG: combine_texture_parts.dsa: output = " + sOutputFilename);
112116
var oCombinedImage = combineImages(aMetallicMapImages);
113117
oCombinedImage.save(sOutputFilename);

0 commit comments

Comments
 (0)