[Bf-blender-cvs] [65d00dd8704] refactor-mesh-uv-map-generic: Fix the versioning of the default scene.

Martijn Versteegh noreply at git.blender.org
Fri Oct 28 12:05:48 CEST 2022


Commit: 65d00dd870498aea258c1ec6188f154f8b5be9e3
Author: Martijn Versteegh
Date:   Fri Oct 28 11:56:40 2022 +0200
Branches: refactor-mesh-uv-map-generic
https://developer.blender.org/rB65d00dd870498aea258c1ec6188f154f8b5be9e3

Fix the versioning of the default scene.

The versioning code accidentally still used CD_MLOOPUV instead of the new
CD_PROP_FLOAT2 layer. Also a cast is needed now the file is C++.

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

M	source/blender/blenloader/intern/versioning_defaults.cc

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

diff --git a/source/blender/blenloader/intern/versioning_defaults.cc b/source/blender/blenloader/intern/versioning_defaults.cc
index 9593b519852..cfc56250bcd 100644
--- a/source/blender/blenloader/intern/versioning_defaults.cc
+++ b/source/blender/blenloader/intern/versioning_defaults.cc
@@ -357,7 +357,7 @@ static void blo_update_defaults_scene(Main *bmain, Scene *scene)
         {0.125, 0.50}, {0.375, 0.50}, {0.375, 0.75}, {0.125, 0.75}, {0.375, 0.50}, {0.625, 0.50},
         {0.625, 0.75}, {0.375, 0.75}, {0.375, 0.25}, {0.625, 0.25}, {0.625, 0.50}, {0.375, 0.50},
     };
-    float(*mloopuv)[2] = CustomData_get_layer(&me->ldata, CD_MLOOPUV);
+    float(*mloopuv)[2] = static_cast<float (*)[2]>(CustomData_get_layer(&me->ldata, CD_PROP_FLOAT2));
     memcpy(mloopuv, uv_values, sizeof(float[2]) * me->totloop);
   }



More information about the Bf-blender-cvs mailing list