Skin Shader update

Added additional licenses, removed AFPL Started to shrink JSON files for readability
animate1978 · Mar 6, 2024 · e484f5f · e484f5f
1 parent 5c336af
commit e484f5f
Show file tree

Hide file tree

Showing 8 changed files with 189 additions and 592 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,15 +14,15 @@ All changes will be documented here
 
 ## Changed
 
-- MBLabSkin3 is a now based off of the 1.7.6 shader with major modifications
+- MBLabSkin3 is a now based off of the 1.7.6 shader with modifications
 - AutoUpdater is disabled
 - SubD levels have increased for better visuals
 - Some menus rearranged for better workflow
+- Added new license types in MB-Dev, also removed AFPL due to restrictive nature
 
 ## Bug Fixes
 
 - Fixed bugs in various files to make it work with Blender 4.0
-- 
 
 ## Known Issues
 

diff --git a/README.md b/README.md
@@ -22,17 +22,21 @@ This fork is an attempt to keep this addon going forward as the original author
 
 - MB-Lab now requires Blender 4.0.0 +
 
-## Added
+### Added
+
+- Melanin map added that adds variance to the skin pigment
 
 ## Changed
 
-- MBLabSkin3 is a now based off of the 1.7.6 shader
+- MBLabSkin3 is a now based off of the 1.7.6 shader with modifications
 - AutoUpdater is disabled
+- SubD levels have increased for better visuals
+- Some menus rearranged for better workflow
+- Added new license types in MB-Dev, also removed AFPL due to restrictive nature
 
 ## Bug Fixes
 
 - Fixed bugs in various files to make it work with Blender 4.0
-- 
 
 ## Known Issues
 

diff --git a/__init__.py b/__init__.py
@@ -2597,12 +2597,12 @@ def draw(self, context):
         icon_collapse = "DISCLOSURE_TRI_DOWN"
 
         box_info = self.layout.box()
-        #box_info.label(text="")
+        box_info.label(text="Open Source Humanoid Creator")
 
         if gui_status == "ERROR_SESSION":
             box_err = self.layout.box()
             box_err.label(text=gui_err_msg, icon="INFO")
-
+        
         if gui_status == "NEW_SESSION":
 
             self.layout.label(text="CREATION OPTIONS", icon='RNA_ADD')
@@ -3113,7 +3113,7 @@ def draw(self, context):
         icon_collapse = "DISCLOSURE_TRI_DOWN"
 
         box_general = self.layout.box()
-        #box_general.label(text="")
+        box_general.label(text="Open Source Humanoid Development Toolkit")
         #box_general.operator('mbcrea.button_for_tests', icon='BLENDER')
 
         box_tools = self.layout.box()
@@ -4627,8 +4627,9 @@ def update_character_new_name(self, context):
     items=[
         ("CC0", "CC0 (Free)", "For commercial or personnal use"),
         ("CC-BY", "CC-BY (Free)", "For commercial or personnal use, attribution required"),
-        ("AGPL3", "AGPL3", "See documentation"),
-        ("AFPL9", "AFPL9 (Personnal use)", "You can't make money with")
+        ("CC-BY-SA", "CC-BY-SA (Free)", "For commercial or personnal use, attribution required"),
+        ("CC-BY-NC", "CC-BY-NC (Free)", "For non-commercial or personnal use, attribution required"),
+        ("AGPL3", "AGPL3", "See documentation")
         ],
     name="license",
     default=None)

diff --git a/data/characters_config.json b/data/characters_config.json
@@ -80,11 +80,11 @@
     "texture_roughness": "human_female_roughness.png",
     "texture_thickness": "human_female_thickness.png",
     "texture_melanin": "human_female_melanin.png",
-    "texture_iris_color" : "iris_color.png",
-    "texture_iris_bump" : "iris_bump.png",
-    "texture_sclera_color" : "sclera_color.png",
-    "texture_translucent_mask" : "translucent_mask.png",
-    "texture_sclera_mask" : "sclera_mask.png",
+    "texture_iris_color": "iris_color.png",
+    "texture_iris_bump": "iris_bump.png",
+    "texture_sclera_color": "sclera_color.png",
+    "texture_translucent_mask": "translucent_mask.png",
+    "texture_sclera_mask": "sclera_mask.png",
     "morphs_extra_file": "",
     "shared_morphs_file": "human_female_morphs.json",
     "shared_morphs_extra_file": "human_female_morphs_extra.json",
@@ -118,11 +118,11 @@
     "texture_roughness": "human_female_roughness.png",
     "texture_thickness": "human_female_thickness.png",
     "texture_melanin": "human_female_melanin.png",
-    "texture_iris_color" : "iris_color.png",
-    "texture_iris_bump" : "iris_bump.png",
-    "texture_sclera_color" : "sclera_color.png",
-    "texture_translucent_mask" : "translucent_mask.png",
-    "texture_sclera_mask" : "sclera_mask.png",
+    "texture_iris_color": "iris_color.png",
+    "texture_iris_bump": "iris_bump.png",
+    "texture_sclera_color": "sclera_color.png",
+    "texture_translucent_mask": "translucent_mask.png",
+    "texture_sclera_mask": "sclera_mask.png",
     "morphs_extra_file": "",
     "shared_morphs_file": "human_female_morphs.json",
     "shared_morphs_extra_file": "human_female_morphs_extra.json",
@@ -156,11 +156,11 @@
     "texture_roughness": "human_female_roughness.png",
     "texture_thickness": "human_female_thickness.png",
     "texture_melanin": "human_female_melanin.png",
-    "texture_iris_color" : "iris_color.png",
-    "texture_iris_bump" : "iris_bump.png",
-    "texture_sclera_color" : "sclera_color.png",
-    "texture_translucent_mask" : "translucent_mask.png",
-    "texture_sclera_mask" : "sclera_mask.png",
+    "texture_iris_color": "iris_color.png",
+    "texture_iris_bump": "iris_bump.png",
+    "texture_sclera_color": "sclera_color.png",
+    "texture_translucent_mask": "translucent_mask.png",
+    "texture_sclera_mask": "sclera_mask.png",
     "morphs_extra_file": "",
     "shared_morphs_file": "human_female_morphs.json",
     "shared_morphs_extra_file": "human_female_morphs_extra.json",
@@ -194,11 +194,11 @@
     "texture_roughness": "human_female_roughness.png",
     "texture_thickness": "human_female_thickness.png",
     "texture_melanin": "human_female_melanin.png",
-    "texture_iris_color" : "iris_color.png",
-    "texture_iris_bump" : "iris_bump.png",
-    "texture_sclera_color" : "sclera_color.png",
-    "texture_translucent_mask" : "translucent_mask.png",
-    "texture_sclera_mask" : "sclera_mask.png",
+    "texture_iris_color": "iris_color.png",
+    "texture_iris_bump": "iris_bump.png",
+    "texture_sclera_color": "sclera_color.png",
+    "texture_translucent_mask": "translucent_mask.png",
+    "texture_sclera_mask": "sclera_mask.png",
     "morphs_extra_file": "",
     "shared_morphs_file": "human_female_morphs.json",
     "shared_morphs_extra_file": "human_female_morphs_extra.json",
@@ -232,11 +232,11 @@
     "texture_roughness": "human_male_roughness.png",
     "texture_thickness": "human_male_thickness.png",
     "texture_melanin": "human_male_melanin.png",
-    "texture_iris_color" : "iris_color.png",
-    "texture_iris_bump" : "iris_bump.png",
-    "texture_sclera_color" : "sclera_color.png",
-    "texture_translucent_mask" : "translucent_mask.png",
-    "texture_sclera_mask" : "sclera_mask.png",
+    "texture_iris_color": "iris_color.png",
+    "texture_iris_bump": "iris_bump.png",
+    "texture_sclera_color": "sclera_color.png",
+    "texture_translucent_mask": "translucent_mask.png",
+    "texture_sclera_mask": "sclera_mask.png",
     "morphs_extra_file": "",
     "shared_morphs_file": "human_male_morphs.json",
     "shared_morphs_extra_file": "human_male_morphs_extra.json",
@@ -270,11 +270,11 @@
     "texture_roughness": "human_male_roughness.png",
     "texture_thickness": "human_male_thickness.png",
     "texture_melanin": "human_male_melanin.png",
-    "texture_iris_color" : "iris_color.png",
-    "texture_iris_bump" : "iris_bump.png",
-    "texture_sclera_color" : "sclera_color.png",
-    "texture_translucent_mask" : "translucent_mask.png",
-    "texture_sclera_mask" : "sclera_mask.png",
+    "texture_iris_color": "iris_color.png",
+    "texture_iris_bump": "iris_bump.png",
+    "texture_sclera_color": "sclera_color.png",
+    "texture_translucent_mask": "translucent_mask.png",
+    "texture_sclera_mask": "sclera_mask.png",
     "morphs_extra_file": "",
     "shared_morphs_file": "human_male_morphs.json",
     "shared_morphs_extra_file": "human_male_morphs_extra.json",
@@ -308,11 +308,11 @@
     "texture_roughness": "human_male_roughness.png",
     "texture_thickness": "human_male_thickness.png",
     "texture_melanin": "human_male_melanin.png",
-    "texture_iris_color" : "iris_color.png",
-    "texture_iris_bump" : "iris_bump.png",
-    "texture_sclera_color" : "sclera_color.png",
-    "texture_translucent_mask" : "translucent_mask.png",
-    "texture_sclera_mask" : "sclera_mask.png",
+    "texture_iris_color": "iris_color.png",
+    "texture_iris_bump": "iris_bump.png",
+    "texture_sclera_color": "sclera_color.png",
+    "texture_translucent_mask": "translucent_mask.png",
+    "texture_sclera_mask": "sclera_mask.png",
     "morphs_extra_file": "",
     "shared_morphs_file": "human_male_morphs.json",
     "shared_morphs_extra_file": "human_male_morphs_extra.json",
@@ -346,11 +346,11 @@
     "texture_roughness": "human_male_roughness.png",
     "texture_thickness": "human_male_thickness.png",
     "texture_melanin": "human_male_melanin.png",
-    "texture_iris_color" : "iris_color.png",
-    "texture_iris_bump" : "iris_bump.png",
-    "texture_sclera_color" : "sclera_color.png",
-    "texture_translucent_mask" : "translucent_mask.png",
-    "texture_sclera_mask" : "sclera_mask.png",
+    "texture_iris_color": "iris_color.png",
+    "texture_iris_bump": "iris_bump.png",
+    "texture_sclera_color": "sclera_color.png",
+    "texture_translucent_mask": "translucent_mask.png",
+    "texture_sclera_mask": "sclera_mask.png",
     "morphs_extra_file": "",
     "shared_morphs_file": "human_male_morphs.json",
     "shared_morphs_extra_file": "human_male_morphs_extra.json",
@@ -384,11 +384,11 @@
     "texture_roughness": "",
     "texture_thickness": "",
     "texture_melanin": "",
-    "texture_iris_color" : "",
-    "texture_iris_bump" : "",
-    "texture_sclera_color" : "",
-    "texture_translucent_mask" : "",
-    "texture_sclera_mask" : "",
+    "texture_iris_color": "",
+    "texture_iris_bump": "",
+    "texture_sclera_color": "",
+    "texture_translucent_mask": "",
+    "texture_sclera_mask": "",
     "morphs_extra_file": "",
     "shared_morphs_file": "anime_female_morphs.json",
     "shared_morphs_extra_file": "",
@@ -424,11 +424,11 @@
     "texture_roughness": "",
     "texture_thickness": "",
     "texture_melanin": "",
-    "texture_iris_color" : "",
-    "texture_iris_bump" : "",
-    "texture_sclera_color" : "",
-    "texture_translucent_mask" : "",
-    "texture_sclera_mask" : "",
+    "texture_iris_color": "",
+    "texture_iris_bump": "",
+    "texture_sclera_color": "",
+    "texture_translucent_mask": "",
+    "texture_sclera_mask": "",
     "morphs_extra_file": "",
     "shared_morphs_file": "anime_female_morphs.json",
     "shared_morphs_extra_file": "",
@@ -464,11 +464,11 @@
     "texture_roughness": "human_female_roughness.png",
     "texture_thickness": "human_female_thickness.png",
     "texture_melanin": "human_female_melanin.png",
-    "texture_iris_color" : "iris_color.png",
-    "texture_iris_bump" : "iris_bump.png",
-    "texture_sclera_color" : "sclera_color.png",
-    "texture_translucent_mask" : "translucent_mask.png",
-    "texture_sclera_mask" : "sclera_mask.png",
+    "texture_iris_color": "iris_color.png",
+    "texture_iris_bump": "iris_bump.png",
+    "texture_sclera_color": "sclera_color.png",
+    "texture_translucent_mask": "translucent_mask.png",
+    "texture_sclera_mask": "sclera_mask.png",
     "morphs_extra_file": "f_an03_morphs_extra.json",
     "shared_morphs_file": "human_female_morphs.json",
     "shared_morphs_extra_file": "human_female_morphs_extra.json",
@@ -502,11 +502,11 @@
     "texture_roughness": "",
     "texture_thickness": "",
     "texture_melanin": "",
-    "texture_iris_color" : "",
-    "texture_iris_bump" : "",
-    "texture_sclera_color" : "",
-    "texture_translucent_mask" : "",
-    "texture_sclera_mask" : "",
+    "texture_iris_color": "",
+    "texture_iris_bump": "",
+    "texture_sclera_color": "",
+    "texture_translucent_mask": "",
+    "texture_sclera_mask": "",
     "morphs_extra_file": "",
     "shared_morphs_file": "anime_male_morphs.json",
     "shared_morphs_extra_file": "",
@@ -542,11 +542,11 @@
     "texture_roughness": "",
     "texture_thickness": "",
     "texture_melanin": "",
-    "texture_iris_color" : "",
-    "texture_iris_bump" : "",
-    "texture_sclera_color" : "",
-    "texture_translucent_mask" : "",
-    "texture_sclera_mask" : "",
+    "texture_iris_color": "",
+    "texture_iris_bump": "",
+    "texture_sclera_color": "",
+    "texture_translucent_mask": "",
+    "texture_sclera_mask": "",
     "morphs_extra_file": "",
     "shared_morphs_file": "anime_male_morphs.json",
     "shared_morphs_extra_file": "",
@@ -582,11 +582,11 @@
     "texture_roughness": "human_male_roughness.png",
     "texture_thickness": "human_male_thickness.png",
     "texture_melanin": "human_male_melanin.png",
-    "texture_iris_color" : "iris_color.png",
-    "texture_iris_bump" : "iris_bump.png",
-    "texture_sclera_color" : "sclera_color.png",
-    "texture_translucent_mask" : "translucent_mask.png",
-    "texture_sclera_mask" : "sclera_mask.png",
+    "texture_iris_color": "iris_color.png",
+    "texture_iris_bump": "iris_bump.png",
+    "texture_sclera_color": "sclera_color.png",
+    "texture_translucent_mask": "translucent_mask.png",
+    "texture_sclera_mask": "sclera_mask.png",
     "morphs_extra_file": "m_an03_morphs_extra.json",
     "shared_morphs_file": "human_male_morphs.json",
     "shared_morphs_extra_file": "human_male_morphs_extra.json",
@@ -620,11 +620,11 @@
     "texture_roughness": "human_female_roughness.png",
     "texture_thickness": "human_female_thickness.png",
     "texture_melanin": "human_female_melanin.png",
-    "texture_iris_color" : "iris_color.png",
-    "texture_iris_bump" : "iris_bump.png",
-    "texture_sclera_color" : "sclera_color.png",
-    "texture_translucent_mask" : "translucent_mask.png",
-    "texture_sclera_mask" : "sclera_mask.png",
+    "texture_iris_color": "iris_color.png",
+    "texture_iris_bump": "iris_bump.png",
+    "texture_sclera_color": "sclera_color.png",
+    "texture_translucent_mask": "translucent_mask.png",
+    "texture_sclera_mask": "sclera_mask.png",
     "morphs_extra_file": "f_ft01_morphs_extra.json",
     "shared_morphs_file": "human_female_morphs.json",
     "shared_morphs_extra_file": "human_female_morphs_extra.json",
@@ -658,11 +658,11 @@
     "texture_roughness": "human_male_roughness.png",
     "texture_thickness": "human_male_thickness.png",
     "texture_melanin": "human_male_melanin.png",
-    "texture_iris_color" : "iris_color.png",
-    "texture_iris_bump" : "iris_bump.png",
-    "texture_sclera_color" : "sclera_color.png",
-    "texture_translucent_mask" : "translucent_mask.png",
-    "texture_sclera_mask" : "sclera_mask.png",
+    "texture_iris_color": "iris_color.png",
+    "texture_iris_bump": "iris_bump.png",
+    "texture_sclera_color": "sclera_color.png",
+    "texture_translucent_mask": "translucent_mask.png",
+    "texture_sclera_mask": "sclera_mask.png",
     "morphs_extra_file": "",
     "shared_morphs_file": "human_male_morphs.json",
     "shared_morphs_extra_file": "human_male_morphs_extra.json",
@@ -696,11 +696,11 @@
     "texture_roughness": "human_male_roughness.png",
     "texture_thickness": "human_male_thickness.png",
     "texture_melanin": "human_male_melanin.png",
-    "texture_iris_color" : "iris_color.png",
-    "texture_iris_bump" : "iris_bump.png",
-    "texture_sclera_color" : "sclera_color.png",
-    "texture_translucent_mask" : "translucent_mask.png",
-    "texture_sclera_mask" : "sclera_mask.png",
+    "texture_iris_color": "iris_color.png",
+    "texture_iris_bump": "iris_bump.png",
+    "texture_sclera_color": "sclera_color.png",
+    "texture_translucent_mask": "translucent_mask.png",
+    "texture_sclera_mask": "sclera_mask.png",
     "morphs_extra_file": "m_ft02_morphs_extra.json",
     "shared_morphs_file": "human_male_morphs.json",
     "shared_morphs_extra_file": "human_male_morphs_extra.json",

diff --git a/data/humanoid_library.blend b/data/humanoid_library.blend