[Bf-blender-cvs] [3a200d6] master: Fix T41604: Double updates of world and material texture settings
Sergey Sharybin
noreply at git.blender.org
Thu Aug 28 11:46:17 CEST 2014
Commit: 3a200d66ae8c8b89aad83009bf6edcc6c1a92263
Author: Sergey Sharybin
Date: Thu Aug 28 15:45:05 2014 +0600
Branches: master
https://developer.blender.org/rB3a200d66ae8c8b89aad83009bf6edcc6c1a92263
Fix T41604: Double updates of world and material texture settings
The issue was caused by the world localization setting the ID_WORLD
type update tag. Now using a function which doesn't pollute the library
and which doesn't set update flags.
===================================================================
M source/blender/blenkernel/intern/world.c
===================================================================
diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c
index 5065c3a..8e3c923 100644
--- a/source/blender/blenkernel/intern/world.c
+++ b/source/blender/blenkernel/intern/world.c
@@ -142,8 +142,7 @@ World *localize_world(World *wrld)
World *wrldn;
int a;
- wrldn = BKE_libblock_copy(&wrld->id);
- BLI_remlink(&G.main->world, wrldn);
+ wrldn = BKE_libblock_copy_nolib(&wrld->id, false);
for (a = 0; a < MAX_MTEX; a++) {
if (wrld->mtex[a]) {
More information about the Bf-blender-cvs
mailing list