diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-08 06:19:41 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-08 06:19:41 +0400 |
commit | 1c91d62c7e682c72173750e88505ba08f6fabcdf (patch) | |
tree | 0a4e1fce12f509453f55de5a6ed7f732bb579999 /source/blender/blenkernel | |
parent | 6029640bcae139d4df59be1b4de5645d4ee251a3 (diff) |
use BLI_path_cmp() rather then strcmp()
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/image.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 4830d7ed61e..5bc3b958f2e 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -313,8 +313,8 @@ static int surface_duplicateOutputExists(void *arg, const char *name) for(; surface; surface=surface->next) { if (surface!=t_surface && surface->type==t_surface->type && surface->format==t_surface->format) { - if (surface->output_name[0]!='\0' && !strcmp(name, surface->output_name)) return 1; - if (surface->output_name2[0]!='\0' && !strcmp(name, surface->output_name2)) return 1; + if (surface->output_name[0]!='\0' && !BLI_path_cmp(name, surface->output_name)) return 1; + if (surface->output_name2[0]!='\0' && !BLI_path_cmp(name, surface->output_name2)) return 1; } } return 0; diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 22e9d1ccf4b..3ac95b83e74 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -531,13 +531,13 @@ Image *BKE_add_image_file(const char *name) BLI_strncpy(strtest, ima->name, sizeof(ima->name)); BLI_path_abs(strtest, G.main->name); - if( strcmp(strtest, str)==0 ) { + if (BLI_path_cmp(strtest, str)==0) { if(ima->anim==NULL || ima->id.us==0) { BLI_strncpy(ima->name, name, sizeof(ima->name)); /* for stringcode */ ima->id.us++; /* officially should not, it doesn't link here! */ if(ima->ok==0) ima->ok= IMA_OK; - /* RETURN! */ + /* RETURN! */ return ima; } } |