[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47062] trunk/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Sun May 27 02:36:52 CEST 2012
Revision: 47062
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47062
Author: campbellbarton
Date: 2012-05-27 00:36:50 +0000 (Sun, 27 May 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/extern/libredcode/codec.c
trunk/blender/intern/cycles/app/cycles_xml.cpp
trunk/blender/intern/cycles/blender/blender_shader.cpp
trunk/blender/intern/cycles/device/device_cuda.cpp
trunk/blender/intern/cycles/device/device_opencl.cpp
trunk/blender/intern/cycles/kernel/svm/svm_tex_coord.h
trunk/blender/intern/cycles/util/util_thread.h
trunk/blender/intern/ghost/test/multitest/EventToBuf.c
trunk/blender/intern/ghost/test/multitest/MultiTest.c
trunk/blender/intern/ghost/test/multitest/ScrollBar.c
trunk/blender/intern/guardedalloc/intern/mallocn.c
trunk/blender/intern/utfconv/utfconv.c
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/blenlib/intern/noise.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/imbuf/intern/anim_movie.c
Modified: trunk/blender/extern/libredcode/codec.c
===================================================================
--- trunk/blender/extern/libredcode/codec.c 2012-05-26 23:18:07 UTC (rev 47061)
+++ trunk/blender/extern/libredcode/codec.c 2012-05-27 00:36:50 UTC (rev 47062)
@@ -7,17 +7,20 @@
#include <stdio.h>
#include <string.h>
-static void error_callback(const char *msg, void *client_data) {
+static void error_callback(const char *msg, void *client_data)
+{
FILE *stream = (FILE*)client_data;
fprintf(stream, "[R3D ERR] %s", msg);
}
-static void warning_callback(const char *msg, void *client_data) {
+static void warning_callback(const char *msg, void *client_data)
+{
FILE *stream = (FILE*)client_data;
fprintf(stream, "[R3D WARN] %s", msg);
}
-static void info_callback(const char *msg, void *client_data) {
+static void info_callback(const char *msg, void *client_data)
+{
(void)client_data;
fprintf(stdout, "[R3D INFO] %s", msg);
}
Modified: trunk/blender/intern/cycles/app/cycles_xml.cpp
===================================================================
--- trunk/blender/intern/cycles/app/cycles_xml.cpp 2012-05-26 23:18:07 UTC (rev 47061)
+++ trunk/blender/intern/cycles/app/cycles_xml.cpp 2012-05-27 00:36:50 UTC (rev 47062)
@@ -673,7 +673,7 @@
for(int j = 0; j < nverts[i]-2; j++) {
int v0 = verts[index_offset];
int v1 = verts[index_offset + j + 1];
- int v2 = verts[index_offset + j + 2];;
+ int v2 = verts[index_offset + j + 2];
sdmesh.add_face(v0, v1, v2);
}
Modified: trunk/blender/intern/cycles/blender/blender_shader.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_shader.cpp 2012-05-26 23:18:07 UTC (rev 47061)
+++ trunk/blender/intern/cycles/blender/blender_shader.cpp 2012-05-27 00:36:50 UTC (rev 47062)
@@ -417,7 +417,7 @@
break;
}
case BL::ShaderNode::type_TEX_COORD: {
- node = new TextureCoordinateNode();;
+ node = new TextureCoordinateNode();
break;
}
case BL::ShaderNode::type_TEX_SKY: {
Modified: trunk/blender/intern/cycles/device/device_cuda.cpp
===================================================================
--- trunk/blender/intern/cycles/device/device_cuda.cpp 2012-05-26 23:18:07 UTC (rev 47061)
+++ trunk/blender/intern/cycles/device/device_cuda.cpp 2012-05-27 00:36:50 UTC (rev 47062)
@@ -226,7 +226,7 @@
string kernel_path = path_get("kernel");
string md5 = path_files_md5_hash(kernel_path);
- cubin = string_printf("cycles_kernel_sm%d%d_%s.cubin", major, minor, md5.c_str());;
+ cubin = string_printf("cycles_kernel_sm%d%d_%s.cubin", major, minor, md5.c_str());
cubin = path_user_get(path_join("cache", cubin));
/* if exists already, use it */
Modified: trunk/blender/intern/cycles/device/device_opencl.cpp
===================================================================
--- trunk/blender/intern/cycles/device/device_opencl.cpp 2012-05-26 23:18:07 UTC (rev 47061)
+++ trunk/blender/intern/cycles/device/device_opencl.cpp 2012-05-27 00:36:50 UTC (rev 47062)
@@ -407,7 +407,7 @@
string device_md5 = device_md5_hash();
/* try to use cache binary */
- string clbin = string_printf("cycles_kernel_%s_%s.clbin", device_md5.c_str(), kernel_md5.c_str());;
+ string clbin = string_printf("cycles_kernel_%s_%s.clbin", device_md5.c_str(), kernel_md5.c_str());
clbin = path_user_get(path_join("cache", clbin));
if(path_exists(clbin)) {
Modified: trunk/blender/intern/cycles/kernel/svm/svm_tex_coord.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_tex_coord.h 2012-05-26 23:18:07 UTC (rev 47061)
+++ trunk/blender/intern/cycles/kernel/svm/svm_tex_coord.h 2012-05-27 00:36:50 UTC (rev 47062)
@@ -43,7 +43,7 @@
else
P = normalize(transform_direction(&tfm, P));
- float2 uv = direction_to_panorama(kg, P);;
+ float2 uv = direction_to_panorama(kg, P);
return make_float3(uv.x, uv.y, 0.0f);
}
Modified: trunk/blender/intern/cycles/util/util_thread.h
===================================================================
--- trunk/blender/intern/cycles/util/util_thread.h 2012-05-26 23:18:07 UTC (rev 47061)
+++ trunk/blender/intern/cycles/util/util_thread.h 2012-05-27 00:36:50 UTC (rev 47062)
@@ -54,7 +54,7 @@
static void *run(void *arg)
{
- ((thread*)arg)->run_cb();;
+ ((thread*)arg)->run_cb();
return NULL;
}
Modified: trunk/blender/intern/ghost/test/multitest/EventToBuf.c
===================================================================
--- trunk/blender/intern/ghost/test/multitest/EventToBuf.c 2012-05-26 23:18:07 UTC (rev 47061)
+++ trunk/blender/intern/ghost/test/multitest/EventToBuf.c 2012-05-27 00:36:50 UTC (rev 47062)
@@ -34,7 +34,8 @@
#include "GHOST_C-api.h"
#include "EventToBuf.h"
-char *eventtype_to_string(GHOST_TEventType type) {
+char *eventtype_to_string(GHOST_TEventType type)
+{
switch(type) {
case GHOST_kEventCursorMove: return "CursorMove";
case GHOST_kEventButtonDown: return "ButtonDown";
@@ -55,7 +56,8 @@
}
}
-static char *keytype_to_string(GHOST_TKey key) {
+static char *keytype_to_string(GHOST_TKey key)
+{
#define K(key) case GHOST_k##key: return #key;
switch (key) {
K(KeyBackSpace);
@@ -193,7 +195,8 @@
#undef K
}
-void event_to_buf(GHOST_EventHandle evt, char buf[128]) {
+void event_to_buf(GHOST_EventHandle evt, char buf[128])
+{
GHOST_TEventType type= GHOST_GetEventType(evt);
double time= (double) ((GHOST_TInt64) GHOST_GetEventTime(evt))/1000;
GHOST_WindowHandle win= GHOST_GetEventWindow(evt);
Modified: trunk/blender/intern/ghost/test/multitest/MultiTest.c
===================================================================
--- trunk/blender/intern/ghost/test/multitest/MultiTest.c 2012-05-26 23:18:07 UTC (rev 47061)
+++ trunk/blender/intern/ghost/test/multitest/MultiTest.c 2012-05-27 00:36:50 UTC (rev 47062)
@@ -75,7 +75,8 @@
/**/
-void rect_bevel_side(int rect[2][2], int side, float *lt, float *dk, float *col, int width) {
+void rect_bevel_side(int rect[2][2], int side, float *lt, float *dk, float *col, int width)
+{
int ltidx = (side / 2) % 4;
int dkidx = (ltidx + 1 + (side & 1)) % 4;
int i, corner;
@@ -107,7 +108,8 @@
glRecti(rect[0][0] + width, rect[0][1] + width, rect[1][0] - width, rect[1][1] - width);
}
-void rect_bevel_smooth(int rect[2][2], int width) {
+void rect_bevel_smooth(int rect[2][2], int width)
+{
float *lt = malloc(sizeof(*lt) * width);
float *dk = malloc(sizeof(*dk) * width);
float col[4];
@@ -143,11 +145,13 @@
int tmouse[2];
} MainWindow;
-static void mainwindow_log(MainWindow *mw, char *str) {
+static void mainwindow_log(MainWindow *mw, char *str)
+{
loggerwindow_log(multitestapp_get_logger(mw->app), str);
}
-static void mainwindow_do_draw(MainWindow *mw) {
+static void mainwindow_do_draw(MainWindow *mw)
+{
GHOST_ActivateWindowDrawingContext(mw->win);
if (mw->lmbut[0]) {
@@ -164,7 +168,8 @@
GHOST_SwapWindowBuffers(mw->win);
}
-static void mainwindow_do_reshape(MainWindow *mw) {
+static void mainwindow_do_reshape(MainWindow *mw)
+{
GHOST_RectangleHandle bounds = GHOST_GetClientBounds(mw->win);
GHOST_ActivateWindowDrawingContext(mw->win);
@@ -183,7 +188,8 @@
glLoadIdentity();
}
-static void mainwindow_do_key(MainWindow *mw, GHOST_TKey key, int press) {
+static void mainwindow_do_key(MainWindow *mw, GHOST_TKey key, int press)
+{
switch (key) {
case GHOST_kKeyC:
if (press)
@@ -226,7 +232,8 @@
}
}
-static void mainwindow_do_move(MainWindow *mw, int x, int y) {
+static void mainwindow_do_move(MainWindow *mw, int x, int y)
+{
mw->lmouse[0] = x, mw->lmouse[1] = y;
if (mw->lmbut[0]) {
@@ -235,7 +242,8 @@
}
}
-static void mainwindow_do_button(MainWindow *mw, int which, int press) {
+static void mainwindow_do_button(MainWindow *mw, int which, int press)
+{
if (which == GHOST_kButtonMaskLeft) {
mw->lmbut[0] = press;
mw->tmouse[0] = mw->lmouse[0], mw->tmouse[1] = mw->lmouse[1];
@@ -249,7 +257,8 @@
}
}
-static void mainwindow_handle(void *priv, GHOST_EventHandle evt) {
+static void mainwindow_handle(void *priv, GHOST_EventHandle evt)
+{
MainWindow *mw = priv;
GHOST_TEventType type = GHOST_GetEventType(evt);
char buf[256];
@@ -289,7 +298,8 @@
/**/
-static void mainwindow_timer_proc(GHOST_TimerTaskHandle task, GHOST_TUns64 time) {
+static void mainwindow_timer_proc(GHOST_TimerTaskHandle task, GHOST_TUns64 time)
+{
MainWindow *mw = GHOST_GetTimerTaskUserData(task);
char buf[64];
@@ -321,7 +331,8 @@
}
}
-void mainwindow_free(MainWindow *mw) {
+void mainwindow_free(MainWindow *mw)
+{
GHOST_SystemHandle sys = multitestapp_get_system(mw->app);
windowdata_free(GHOST_GetWindowUserData(mw->win));
@@ -362,7 +373,8 @@
#define SCROLLBAR_PAD 2
#define SCROLLBAR_WIDTH 14
#define TEXTAREA_PAD 2
-static void loggerwindow_recalc_regions(LoggerWindow *lw) {
+static void loggerwindow_recalc_regions(LoggerWindow *lw)
+{
int nscroll[2][2];
nscroll[0][0] = SCROLLBAR_PAD;
@@ -381,7 +393,8 @@
scrollbar_set_rect(lw->scroll, nscroll);
}
-static void loggerwindow_setup_window_gl(LoggerWindow *lw) {
+static void loggerwindow_setup_window_gl(LoggerWindow *lw)
+{
glViewport(0, 0, lw->size[0], lw->size[1]);
glMatrixMode(GL_PROJECTION);
@@ -393,7 +406,8 @@
glLoadIdentity();
}
-static void loggerwindow_do_reshape(LoggerWindow *lw) {
+static void loggerwindow_do_reshape(LoggerWindow *lw)
+{
GHOST_RectangleHandle bounds = GHOST_GetClientBounds(lw->win);
GHOST_ActivateWindowDrawingContext(lw->win);
@@ -405,7 +419,8 @@
loggerwindow_setup_window_gl(lw);
}
-static void loggerwindow_do_draw(LoggerWindow *lw) {
+static void loggerwindow_do_draw(LoggerWindow *lw)
+{
int i, ndisplines, startline;
int sb_rect[2][2], sb_thumb[2][2];
@@ -472,7 +487,8 @@
GHOST_SwapWindowBuffers(lw->win);
}
-static void loggerwindow_do_move(LoggerWindow *lw, int x, int y) {
+static void loggerwindow_do_move(LoggerWindow *lw, int x, int y)
+{
lw->lmouse[0] = x, lw->lmouse[1] = y;
if (scrollbar_is_scrolling(lw->scroll)) {
@@ -481,7 +497,8 @@
}
}
-static void loggerwindow_do_button(LoggerWindow *lw, int which, int press) {
+static void loggerwindow_do_button(LoggerWindow *lw, int which, int press)
+{
if (which == GHOST_kButtonMaskLeft) {
lw->lmbut[0] = press;
@@ -508,7 +525,8 @@
}
}
-static void loggerwindow_do_key(LoggerWindow *lw, GHOST_TKey key, int press) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list