archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

style cleanup

Browse Source
This commit is contained in:
Campbell Barton
2012-10-30 12:18:45 +00:00
parent 8a658d4050
commit c8975c4375
5 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/transform/transform_conversions.c
View File

@@ -130,9 +130,9 @@ static int trans_data_compare_dist(const void *A, const void *B)
const TransData *td_A = (const TransData*)A;
const TransData *td_B = (const TransData*)B;
if(td_A->dist < td_B->dist)
if (td_A->dist < td_B->dist)
return -1;
else if(td_A->dist > td_B->dist)
else if (td_A->dist > td_B->dist)
return 1;
return 0;
@@ -143,9 +143,9 @@ static int trans_data_compare_rdist(const void *A, const void *B)
const TransData *td_A = (const TransData*)A;
const TransData *td_B = (const TransData*)B;
if(td_A->rdist < td_B->rdist)
if (td_A->rdist < td_B->rdist)
return -1;
else if(td_A->rdist > td_B->rdist)
else if (td_A->rdist > td_B->rdist)
return 1;
return 0;

4
source/blender/gpu/intern/gpu_draw.c
View File

@@ -620,7 +620,7 @@ int GPU_verify_image(Image *ima, ImageUser *iuser, int tftile, int compare, int
GPU_create_gl_tex(bind, rect, frect, rectw, recth, mipmap, use_high_bit_depth, ima);
/* mark as non-color data texture */
if(*bind) {
if (*bind) {
if (is_data)
ima->tpageflag |= IMA_GLBIND_IS_DATA;
else
@@ -739,7 +739,7 @@ int GPU_upload_dxt_texture(ImBuf *ibuf)
return FALSE;
}
if(!is_power_of_2_i(width) || !is_power_of_2_i(height)) {
if (!is_power_of_2_i(width) || !is_power_of_2_i(height)) {
printf("Unable to load non-power-of-two DXT image resolution, falling back to uncompressed\n");
return FALSE;
}

4
source/blender/imbuf/intern/dds/FlipDXT.cpp
View File

@@ -173,10 +173,10 @@ static void FlipDXT5BlockHalf(uint8_t *block)
int FlipDXTCImage(unsigned int width, unsigned int height, unsigned int levels, int fourcc, uint8_t *data)
{
// must have valid dimensions
if(width == 0 || height == 0)
if (width == 0 || height == 0)
return 0;
// height must be a power-of-two
if((height & (height - 1)) != 0)
if ((height & (height - 1)) != 0)
return 0;
FlipBlockFunction full_block_function;

39
source/blender/quicktime/apple/qtkit_import.m
View File

@@ -71,7 +71,7 @@ void quicktime_init(void)
void quicktime_exit(void)
{
if(G.have_quicktime) {
if (G.have_quicktime) {
free_qtcomponentdata();
}
}
@@ -82,27 +82,30 @@ int anim_is_quicktime (const char *name)
NSAutoreleasePool *pool;
// don't let quicktime movie import handle these
if( BLI_testextensie(name, ".swf") ||
BLI_testextensie(name, ".txt") ||
BLI_testextensie(name, ".mpg") ||
BLI_testextensie(name, ".avi") || // wouldn't be appropriate ;)
BLI_testextensie(name, ".mov") || // disabled, suboptimal decoding speed
BLI_testextensie(name, ".mp4") || // disabled, suboptimal decoding speed
BLI_testextensie(name, ".m4v") || // disabled, suboptimal decoding speed
BLI_testextensie(name, ".tga") ||
BLI_testextensie(name, ".png") ||
BLI_testextensie(name, ".bmp") ||
BLI_testextensie(name, ".jpg") ||
BLI_testextensie(name, ".wav") ||
BLI_testextensie(name, ".zip") ||
BLI_testextensie(name, ".mp3")) return 0;
if (BLI_testextensie(name, ".swf") ||
BLI_testextensie(name, ".txt") ||
BLI_testextensie(name, ".mpg") ||
BLI_testextensie(name, ".avi") || // wouldn't be appropriate ;)
BLI_testextensie(name, ".mov") || // disabled, suboptimal decoding speed
BLI_testextensie(name, ".mp4") || // disabled, suboptimal decoding speed
BLI_testextensie(name, ".m4v") || // disabled, suboptimal decoding speed
BLI_testextensie(name, ".tga") ||
BLI_testextensie(name, ".png") ||
BLI_testextensie(name, ".bmp") ||
BLI_testextensie(name, ".jpg") ||
BLI_testextensie(name, ".wav") ||
BLI_testextensie(name, ".zip") ||
BLI_testextensie(name, ".mp3"))
{
return 0;
}
if(QTIME_DEBUG) printf("qt: checking as movie: %s\n", name);
if (QTIME_DEBUG) printf("qt: checking as movie: %s\n", name);
pool = [[NSAutoreleasePool alloc] init];
if([QTMovie canInitWithFile:[NSString stringWithCString:name
encoding:[NSString defaultCStringEncoding]]])
if ([QTMovie canInitWithFile:[NSString stringWithCString:name
encoding:[NSString defaultCStringEncoding]]])
{
[pool drain];
return true;

2
source/blender/windowmanager/intern/wm_event_system.c
View File

@@ -1918,7 +1918,7 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
else {
wmWindow *win = CTX_wm_window(C);
if(win)
if (win)
win->eventstate->check_click = 0;
}
}