archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Refactor remapping's pre/post process of special cases.

Browse Source 
Main issue was that BKE_libblock_relink_ex was pretty much ignoring all those...
Also, unlinking of objects was not handling correctly indirect-related flags.

Refactored code into helper functions to avoid too much duplicated code.
This commit is contained in:
Bastien Montagne
2016-07-08 13:22:54 +02:00
parent 3b7bce42d7
commit 71f5df9f44
3 changed files with 172 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/render/render_preview.c
View File

@@ -864,7 +864,7 @@ static void shader_preview_free(void *customdata)
/* get rid of copied world */
BLI_remlink(&pr_main->world, sp->worldcopy);
/* T32865 - we need to unlink the texture copies, unlike for materials */
BKE_libblock_relink_ex(sp->worldcopy, NULL, NULL, true);
BKE_libblock_relink_ex(pr_main, sp->worldcopy, NULL, NULL, true);
BKE_world_free(sp->worldcopy);
properties = IDP_GetProperties((ID *)sp->worldcopy, false);
@@ -881,7 +881,7 @@ static void shader_preview_free(void *customdata)
/* get rid of copied lamp */
BLI_remlink(&pr_main->lamp, sp->lampcopy);
BKE_libblock_relink_ex(sp->lampcopy, NULL, NULL, true);
BKE_libblock_relink_ex(pr_main, sp->lampcopy, NULL, NULL, true);
BKE_lamp_free(sp->lampcopy);
properties = IDP_GetProperties((ID *)sp->lampcopy, false);