Commit: 1eac4fde27ddb6bbfea04cfd3311722629910b8f
Author: Bastien Montagne
Date: Thu Jun 16 16:56:20 2016 +0200
Branches: id-remap
https://developer.blender.org/rB1eac4fde27ddb6bbfea04cfd3311722629910b8f
Fix missing mask ID pointer update in Clip/Image spaces' remap callbacks.
===================================================================
M source/blender/editors/space_clip/space_clip.c
M source/blender/editors/space_image/space_image.c
===================================================================
diff --git a/source/blender/editors/space_clip/space_clip.c
b/source/blender/editors/space_clip/space_clip.c
index 9164869..f844095 100644
--- a/source/blender/editors/space_clip/space_clip.c
+++ b/source/blender/editors/space_clip/space_clip.c
@@ -1521,6 +1521,11 @@ static void clip_id_remap(ScrArea *UNUSED(sa), SpaceLink
*slink, ID *old_id, ID
sclip->clip = (MovieClip *)new_id;
id_us_ensure_real(new_id);
}
+
+ if ((ID *)sclip->mask_info.mask == old_id) {
+ sclip->mask_info.mask = (Mask *)new_id;
+ id_us_ensure_real(new_id);
+ }
}
/* only called once, from space/spacetypes.c */
diff --git a/source/blender/editors/space_image/space_image.c
b/source/blender/editors/space_image/space_image.c
index bbbea7c..f2cb9b4 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -997,6 +997,11 @@ static void image_id_remap(ScrArea *UNUSED(sa), SpaceLink
*slink, ID *old_id, ID
id_us_min(old_id);
id_us_plus(new_id);
}
+
+ if ((ID *)simg->mask_info.mask == old_id) {
+ simg->mask_info.mask = (Mask *)new_id;
+ id_us_ensure_real(new_id);
+ }
}
/**************************** spacetype *****************************/
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
