blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 761 Projects 19 Wiki Activity

Cleanup: tabs 

Set your editor to tabs for all C/C++!
This commit is contained in:
Campbell Barton 2014-10-09 17:11:47 +02:00
parent 2025730715
commit 9f18e4f0eb
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/space_file/fsmenu.c
View File

@ -444,11 +444,11 @@ void fsmenu_read_system(struct FSMenu *fsmenu, int read_bookmarks)
if (pathString == NULL || !CFStringGetCString(pathString, line, sizeof(line), kCFStringEncodingASCII))
continue;
/* Exclude "all my files" as it makes no sense in blender fileselector */
/* Exclude "airdrop" if wlan not active as it would show "" ) */
if (!strstr((char *)line, "myDocuments.cannedSearch") && (strcmp((char *)line, ""))) {
fsmenu_insert_entry(fsmenu, FS_CATEGORY_SYSTEM_BOOKMARKS, line, NULL);
}
/* Exclude "all my files" as it makes no sense in blender fileselector */
/* Exclude "airdrop" if wlan not active as it would show "" ) */
if (!strstr((char *)line, "myDocuments.cannedSearch") && (strcmp((char *)line, ""))) {
fsmenu_insert_entry(fsmenu, FS_CATEGORY_SYSTEM_BOOKMARKS, line, NULL);
}
CFRelease(pathString);
CFRelease(cfURL);

2
source/blender/makesrna/intern/rna_image.c
View File

@ -402,7 +402,7 @@ static int rna_Image_is_float_get(PointerRNA *ptr)
static void rna_Image_render_slots_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
{
Image *image = (Image *)ptr->id.data;
rna_iterator_array_begin(iter, (void*)image->render_slots, sizeof(RenderSlot), IMA_MAX_RENDER_SLOT, 0, NULL);
rna_iterator_array_begin(iter, (void *)image->render_slots, sizeof(RenderSlot), IMA_MAX_RENDER_SLOT, 0, NULL);
}
static PointerRNA rna_render_slots_active_get(PointerRNA *ptr)