[Bf-blender-cvs] [9f18e4f] master: Cleanup: tabs
Campbell Barton
noreply at git.blender.org
Thu Oct 9 17:13:06 CEST 2014
Commit: 9f18e4f0eb81b7e4ab62f361e1d0c668a8b5eb35
Author: Campbell Barton
Date: Thu Oct 9 17:11:47 2014 +0200
Branches: master
https://developer.blender.org/rB9f18e4f0eb81b7e4ab62f361e1d0c668a8b5eb35
Cleanup: tabs
Set your editor to tabs for all C/C++!
===================================================================
M source/blender/editors/space_file/fsmenu.c
M source/blender/makesrna/intern/rna_image.c
===================================================================
diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c
index 6bc1d56..00d9680 100644
--- a/source/blender/editors/space_file/fsmenu.c
+++ b/source/blender/editors/space_file/fsmenu.c
@@ -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);
diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c
index 2d8e41f..141de51 100644
--- a/source/blender/makesrna/intern/rna_image.c
+++ b/source/blender/makesrna/intern/rna_image.c
@@ -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)
More information about the Bf-blender-cvs
mailing list