[Bf-blender-cvs] [f8b2268f4fb] master: Fix error renaming Lamp to Light

Campbell Barton noreply at git.blender.org
Sun Apr 21 22:35:02 CEST 2019


Commit: f8b2268f4fbe92a1860c525f70fdc293304575ff
Author: Campbell Barton
Date:   Mon Apr 22 06:21:49 2019 +1000
Branches: master
https://developer.blender.org/rBf8b2268f4fbe92a1860c525f70fdc293304575ff

Fix error renaming Lamp to Light

Introduced in batch rename 3051e2f4ae8fd3e72a4.

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

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

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

diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index 25bd738ce45..6a72ff58f32 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -328,8 +328,8 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template)
     }
 
     /* Rename light objects. */
-    rename_id_for_versioning(bmain, ID_OB, "Light", "Light");
-    rename_id_for_versioning(bmain, ID_LA, "Light", "Light");
+    rename_id_for_versioning(bmain, ID_OB, "Lamp", "Light");
+    rename_id_for_versioning(bmain, ID_LA, "Lamp", "Light");
 
     for (Mesh *mesh = bmain->meshes.first; mesh; mesh = mesh->id.next) {
       /* Match default for new meshes. */



More information about the Bf-blender-cvs mailing list