[Bf-blender-cvs] [5115e86] master: Fix T38808: Re-opening an image makes absolute

Campbell Barton noreply at git.blender.org
Tue Feb 17 20:40:10 CET 2015


Commit: 5115e862460203c5e31bb5d62acc3fda2b0cc2bd
Author: Campbell Barton
Date:   Wed Feb 18 06:38:10 2015 +1100
Branches: master
https://developer.blender.org/rB5115e862460203c5e31bb5d62acc3fda2b0cc2bd

Fix T38808: Re-opening an image makes absolute

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

M	source/blender/blenkernel/intern/image.c

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

diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 131a19b..5807ea5 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -687,8 +687,7 @@ Image *BKE_image_load_exists_ex(const char *filepath, bool *r_exists)
 
 			if (BLI_path_cmp(strtest, str) == 0) {
 				if (ima->anim == NULL || ima->id.us == 0) {
-					BLI_strncpy(ima->name, filepath, sizeof(ima->name));    /* for stringcode */
-					ima->id.us++;                                       /* officially should not, it doesn't link here! */
+					ima->id.us++;  /* officially should not, it doesn't link here! */
 					if (ima->ok == 0)
 						ima->ok = IMA_OK;
 					if (r_exists)




More information about the Bf-blender-cvs mailing list