[Bf-blender-cvs] [e2736afdbef] master: Cycles: Add versioning code for the new Sky Texture model

Lukas Stockner noreply at git.blender.org
Mon Jul 13 03:15:37 CEST 2020


Commit: e2736afdbefde486bc051627dbedeaa28cdb972e
Author: Lukas Stockner
Date:   Mon Jul 13 01:44:24 2020 +0200
Branches: master
https://developer.blender.org/rBe2736afdbefde486bc051627dbedeaa28cdb972e

Cycles: Add versioning code for the new Sky Texture model

Differential Revision: https://developer.blender.org/D8091

===================================================================

M	source/blender/blenloader/intern/versioning_290.c

===================================================================

diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c
index 0d16b58d28f..e608a90aab0 100644
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@ -21,6 +21,7 @@
 #define DNA_DEPRECATED_ALLOW
 
 #include "BLI_listbase.h"
+#include "BLI_math.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_brush_types.h"
@@ -36,6 +37,7 @@
 #include "BKE_colortools.h"
 #include "BKE_lib_id.h"
 #include "BKE_main.h"
+#include "BKE_node.h"
 
 #include "BLO_readfile.h"
 #include "readfile.h"
@@ -255,6 +257,28 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain)
         }
       }
     }
+
+    /* Initialize parameters of the new Nishita sky model. */
+    if (!DNA_struct_elem_find(fd->filesdna, "NodeTexSky", "float", "sun_size")) {
+      FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
+        if (ntree->type == NTREE_SHADER) {
+          LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
+            if (node->type == SH_NODE_TEX_SKY && node->storage) {
+              NodeTexSky *tex = (NodeTexSky *)node->storage;
+              tex->sun_disc = true;
+              tex->sun_size = DEG2RADF(0.545);
+              tex->sun_elevation = M_PI_2;
+              tex->sun_rotation = 0.0f;
+              tex->altitude = 0.0f;
+              tex->air_density = 1.0f;
+              tex->dust_density = 1.0f;
+              tex->ozone_density = 1.0f;
+            }
+          }
+        }
+      }
+      FOREACH_NODETREE_END;
+    }
   }
 
   if (!MAIN_VERSION_ATLEAST(bmain, 290, 6)) {



More information about the Bf-blender-cvs mailing list