Revision: 47290
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47290
Author: campbellbarton
Date: 2012-05-31 18:40:06 +0000 (Thu, 31 May 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/material.c
trunk/blender/source/blender/blenlib/intern/path_util.c
trunk/blender/source/blender/compositor/intern/COM_WorkScheduler.cpp
trunk/blender/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
trunk/blender/source/blender/compositor/operations/COM_CompositorOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MovieDistortionOperation.h
trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
trunk/blender/source/blender/editors/space_outliner/outliner_select.c
trunk/blender/source/blender/editors/space_outliner/outliner_tools.c
trunk/blender/source/blender/makesrna/intern/rna_image_api.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/source/blender/blenkernel/intern/material.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/material.c 2012-05-31
17:26:58 UTC (rev 47289)
+++ trunk/blender/source/blender/blenkernel/intern/material.c 2012-05-31
18:40:06 UTC (rev 47290)
@@ -840,7 +840,7 @@
int actcol_orig = ob->actcol;
short i;
- while (object_remove_material_slot(ob)) {};
+ while (object_remove_material_slot(ob)) {}
/* now we have the right number of slots */
for (i = 0; i < totcol; i++)
Modified: trunk/blender/source/blender/blenlib/intern/path_util.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/path_util.c 2012-05-31
17:26:58 UTC (rev 47289)
+++ trunk/blender/source/blender/blenlib/intern/path_util.c 2012-05-31
18:40:06 UTC (rev 47290)
@@ -98,7 +98,7 @@
if (lslash)
lenlslash = (int)(lslash - string);
- while (len > lenlslash && string[--len] != '.') {};
+ while (len > lenlslash && string[--len] != '.') {}
if (len == lenlslash && string[len] != '.') len = len2;
for (i = len - 1; i >= lenlslash; i--) {
Modified: trunk/blender/source/blender/compositor/intern/COM_WorkScheduler.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_WorkScheduler.cpp
2012-05-31 17:26:58 UTC (rev 47289)
+++ trunk/blender/source/blender/compositor/intern/COM_WorkScheduler.cpp
2012-05-31 18:40:06 UTC (rev 47290)
@@ -275,7 +275,8 @@
printf("%s", build_log);
delete build_log;
- } else {
+ }
+ else {
unsigned int indexDevices;
for (indexDevices = 0 ; indexDevices <
totalNumberOfDevices ; indexDevices ++) {
cl_device_id device =
cldevices[indexDevices];
Modified: trunk/blender/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
2012-05-31 17:26:58 UTC (rev 47289)
+++ trunk/blender/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
2012-05-31 18:40:06 UTC (rev 47290)
@@ -52,7 +52,8 @@
this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
}
graph->addOperation(operation);
- } else if (editorNode->custom1 == CMP_NODE_DILATEERODE_DISTANCE) {
+ }
+ else if (editorNode->custom1 == CMP_NODE_DILATEERODE_DISTANCE) {
if (editorNode->custom2 > 0) {
DilateDistanceOperation * operation = new
DilateDistanceOperation();
operation->setDistance(editorNode->custom2);
@@ -67,7 +68,8 @@
this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
graph->addOperation(operation);
}
- } else {
+ }
+ else {
if (editorNode->custom2 > 0) {
DilateStepOperation * operation = new
DilateStepOperation();
operation->setIterations(editorNode->custom2);
Modified:
trunk/blender/source/blender/compositor/operations/COM_CompositorOperation.cpp
===================================================================
---
trunk/blender/source/blender/compositor/operations/COM_CompositorOperation.cpp
2012-05-31 17:26:58 UTC (rev 47289)
+++
trunk/blender/source/blender/compositor/operations/COM_CompositorOperation.cpp
2012-05-31 18:40:06 UTC (rev 47290)
@@ -68,7 +68,8 @@
MEM_freeN(rr->rectf);
}
rr->rectf = outputBuffer;
- } else {
+ }
+ else {
if (this->outputBuffer) {
MEM_freeN(this->outputBuffer);
}
Modified:
trunk/blender/source/blender/compositor/operations/COM_MovieDistortionOperation.h
===================================================================
---
trunk/blender/source/blender/compositor/operations/COM_MovieDistortionOperation.h
2012-05-31 17:26:58 UTC (rev 47289)
+++
trunk/blender/source/blender/compositor/operations/COM_MovieDistortionOperation.h
2012-05-31 18:40:06 UTC (rev 47290)
@@ -81,10 +81,11 @@
if (x<0 || x >= this->width || y <0 || y >= this->height) {
*u = x;
*v = y;
- } else {
+ }
+ else {
+ int offset = y * this->width + x;
+ int offset2 = offset * 2;
- int offset = y * this->width + x;
- int offset2 = offset*2;
if (!bufferCalculated[offset]) {
//float overscan = 0.0f;
float w = (float)this->width/* / (1 + overscan)
*/;
@@ -99,7 +100,8 @@
if (inverted) {
BKE_tracking_invert_intrinsics(trackingData, in, out);
- } else {
+ }
+ else {
BKE_tracking_apply_intrinsics(trackingData, in, out);
}
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
2012-05-31 17:26:58 UTC (rev 47289)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
2012-05-31 18:40:06 UTC (rev 47290)
@@ -300,7 +300,8 @@
BLI_strncpy(expanded, lib->name,
sizeof(expanded));
BLI_path_abs(expanded, G.main->name);
if (!BLI_exists(expanded)) {
- BKE_reportf(CTX_wm_reports(C),
RPT_ERROR, "Library path '%s' does not exist, correct this before saving",
expanded);
+ BKE_reportf(CTX_wm_reports(C),
RPT_ERROR,
+ "Library path '%s' does not
exist, correct this before saving", expanded);
}
}
}
@@ -570,7 +571,8 @@
BLI_strncpy(kmi->idname, ot->idname, OP_MAX_TYPENAME);
}
-static void operator_search_cb(const struct bContext *UNUSED(C), void
*UNUSED(arg_kmi), const char *str, uiSearchItems *items)
+static void operator_search_cb(const struct bContext *UNUSED(C), void
*UNUSED(arg_kmi),
+ const char *str, uiSearchItems *items)
{
GHashIterator *iter = WM_operatortype_iter();
@@ -1192,7 +1194,11 @@
uiSetRoundBox(UI_CNR_ALL);
glColor4ub(255, 255, 255, 100);
- uiRoundBox((float) *offsx - 0.5f * ufac,
(float)ys - 1.0f * ufac, (float)*offsx + UI_UNIT_Y - 3.0f * ufac, (float)ys +
UI_UNIT_Y - 3.0f * ufac, UI_UNIT_Y / 2.0f - 2.0f * ufac);
+ uiRoundBox((float) *offsx - 0.5f * ufac,
+ (float)ys - 1.0f * ufac,
+ (float)*offsx + UI_UNIT_Y - 3.0f *
ufac,
+ (float)ys + UI_UNIT_Y - 3.0f * ufac,
+ (float)UI_UNIT_Y / 2.0f - 2.0f *
ufac);
glEnable(GL_BLEND); /* roundbox disables */
}
@@ -1324,7 +1330,11 @@
/* active circle */
if (active) {
uiSetRoundBox(UI_CNR_ALL);
- uiRoundBox((float)startx + UI_UNIT_Y - 1.5f * ufac,
(float)*starty + 2.0f * ufac, (float)startx + 2.0f * UI_UNIT_Y - 4.0f * ufac,
(float)*starty + UI_UNIT_Y - 1.0f * ufac, UI_UNIT_Y / 2.0f - 2.0f * ufac);
+ uiRoundBox((float)startx + UI_UNIT_Y - 1.5f * ufac,
+ (float)*starty + 2.0f * ufac,
+ (float)startx + 2.0f * UI_UNIT_Y - 4.0f *
ufac,
+ (float)*starty + UI_UNIT_Y - 1.0f * ufac,
+ UI_UNIT_Y / 2.0f - 2.0f * ufac);
glEnable(GL_BLEND); /* roundbox disables it */
te->flag |= TE_ACTIVE; // for lookup in display
hierarchies
@@ -1549,7 +1559,10 @@
/* background underneath */
UI_ThemeColor(TH_BACK);
- glRecti((int)ar->v2d.cur.xmax - OL_TOGW, (int)ar->v2d.cur.ymin -
V2D_SCROLL_HEIGHT - 1, (int)ar->v2d.cur.xmax + V2D_SCROLL_WIDTH,
(int)ar->v2d.cur.ymax);
+ glRecti((int)ar->v2d.cur.xmax - OL_TOGW,
+ (int)ar->v2d.cur.ymin - V2D_SCROLL_HEIGHT - 1,
+ (int)ar->v2d.cur.xmax + V2D_SCROLL_WIDTH,
+ (int)ar->v2d.cur.ymax);
UI_ThemeColorShade(TH_BACK, 6);
ystart = (int)ar->v2d.tot.ymax;
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
2012-05-31 17:26:58 UTC (rev 47289)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
2012-05-31 18:40:06 UTC (rev 47290)
@@ -205,7 +205,8 @@
}
}
-void item_rename_cb(bContext *C, Scene *UNUSED(scene), TreeElement *te,
TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
+void item_rename_cb(bContext *C, Scene *UNUSED(scene), TreeElement *te,
+ TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
{
ARegion *ar = CTX_wm_region(C);
ReportList *reports = CTX_wm_reports(C); // XXX
@@ -340,7 +341,8 @@
/* Toggle Visibility ---------------------------------------- */
-void object_toggle_visibility_cb(bContext *C, Scene *scene, TreeElement *te,
TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
+void object_toggle_visibility_cb(bContext *C, Scene *scene, TreeElement *te,
+ TreeStoreElem *UNUSED(tsep), TreeStoreElem
*tselem)
{
Base *base = (Base *)te->directdata;
Object *ob = (Object *)tselem->id;
@@ -355,7 +357,8 @@
}
}
-void group_toggle_visibility_cb(bContext *UNUSED(C), Scene *scene, TreeElement
*UNUSED(te), TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
+void group_toggle_visibility_cb(bContext *UNUSED(C), Scene *scene, TreeElement
*UNUSED(te),
+ TreeStoreElem *UNUSED(tsep), TreeStoreElem
*tselem)
{
Group *group = (Group *)tselem->id;
restrictbutton_gr_restrict_flag(scene, group, OB_RESTRICT_VIEW);
@@ -391,7 +394,8 @@
/* Toggle Selectability ---------------------------------------- */
-void object_toggle_selectability_cb(bContext *UNUSED(C), Scene *scene,
TreeElement *te, TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
+void object_toggle_selectability_cb(bContext *UNUSED(C), Scene *scene,
TreeElement *te,
+ TreeStoreElem *UNUSED(tsep), TreeStoreElem
*tselem)
{
Base *base = (Base *)te->directdata;
@@ -401,7 +405,8 @@
}
}
-void group_toggle_selectability_cb(bContext *UNUSED(C), Scene *scene,
TreeElement *UNUSED(te), TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
+void group_toggle_selectability_cb(bContext *UNUSED(C), Scene *scene,
TreeElement *UNUSED(te),
+ TreeStoreElem *UNUSED(tsep), TreeStoreElem
*tselem)
{
Group *group = (Group *)tselem->id;
restrictbutton_gr_restrict_flag(scene, group, OB_RESTRICT_SELECT);
@@ -437,7 +442,8 @@
/* Toggle Renderability ---------------------------------------- */
-void object_toggle_renderability_cb(bContext *UNUSED(C), Scene *scene,
TreeElement *te, TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
+void object_toggle_renderability_cb(bContext *UNUSED(C), Scene *scene,
TreeElement *te,
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
