Commit: 29182dd5700eb0866aeee42dda9b03d6e7db57cc
Author: Campbell Barton
Date: Tue Jun 26 08:35:35 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB29182dd5700eb0866aeee42dda9b03d6e7db57cc
Cleanup: style
===================================================================
M source/blender/depsgraph/intern/depsgraph_physics.cc
M source/blender/editors/interface/interface_icons.c
M source/blender/editors/interface/interface_layout.c
M source/blender/editors/space_view3d/view3d_draw.c
===================================================================
diff --git a/source/blender/depsgraph/intern/depsgraph_physics.cc
b/source/blender/depsgraph/intern/depsgraph_physics.cc
index 925a3497e22..e542e0c48ae 100644
--- a/source/blender/depsgraph/intern/depsgraph_physics.cc
+++ b/source/blender/depsgraph/intern/depsgraph_physics.cc
@@ -61,7 +61,7 @@ static ePhysicsRelationType
modifier_to_relation_type(unsigned int modifier_type
return DEG_PHYSICS_SMOKE_COLLISION;
case eModifierType_DynamicPaint:
return DEG_PHYSICS_DYNAMIC_BRUSH;
- };
+ }
BLI_assert(!"Unknown collision modifier type");
return DEG_PHYSICS_RELATIONS_NUM;
diff --git a/source/blender/editors/interface/interface_icons.c
b/source/blender/editors/interface/interface_icons.c
index ec9112247e6..a8feaedf717 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -858,7 +858,7 @@ static void
ui_studiolight_kill_icon_preview_job(wmWindowManager *wm, int icon_i
icon->obj = NULL;
}
-static void ui_studiolight_free_function(StudioLight *sl, void* data)
+static void ui_studiolight_free_function(StudioLight *sl, void *data)
{
wmWindowManager *wm = data;
@@ -920,7 +920,7 @@ void ui_icon_ensure_deferred(const bContext *C, const int
icon_id, const bool bi
di->data.buffer.image =
img;
wmJob *wm_job =
WM_jobs_get(wm, CTX_wm_window(C), icon, "StudioLight Icon", 0,
WM_JOB_TYPE_STUDIOLIGHT);
- Icon **tmp =
MEM_callocN(sizeof(Icon*), __func__);
+ Icon **tmp =
MEM_callocN(sizeof(Icon *), __func__);
*tmp = icon;
WM_jobs_customdata_set(wm_job, tmp, MEM_freeN);
WM_jobs_timer(wm_job,
0.01, 0, NC_WINDOW);
diff --git a/source/blender/editors/interface/interface_layout.c
b/source/blender/editors/interface/interface_layout.c
index 53a09136392..05af133616e 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -3184,12 +3184,12 @@ static void ui_litem_estimate_grid_flow(uiLayout *litem)
.litem_y = litem->y,
.space_x = space_x,
.space_y = space_y,
- }),
+ }),
&((UILayoutGridFlowOutput) {
.tot_items = &gflow->tot_items,
.global_avg_w = &avg_w,
.global_max_h = &max_h,
- }));
+ }));
if (gflow->tot_items == 0) {
litem->w = litem->h = 0;
@@ -3271,11 +3271,11 @@ static void ui_litem_estimate_grid_flow(uiLayout *litem)
.space_y = space_y,
.tot_columns = gflow->tot_columns,
.tot_rows = gflow->tot_rows,
- }),
+ }),
&((UILayoutGridFlowOutput) {
.tot_w = &tot_w,
.tot_h = &tot_h,
- }));
+ }));
litem->w = tot_w;
litem->h = tot_h;
@@ -3319,13 +3319,13 @@ static void ui_litem_layout_grid_flow(uiLayout *litem)
.space_y = space_y,
.tot_columns = gflow->tot_columns,
.tot_rows = gflow->tot_rows,
- }),
+ }),
&((UILayoutGridFlowOutput) {
.cos_x_array = cos_x,
.cos_y_array = cos_y,
.widths_array = widths,
.heights_array = heights,
- }));
+ }));
for (item = litem->items.first, i = 0; item; item = item->next, i++) {
const int col = gflow->row_major ? i % gflow->tot_columns : i /
gflow->tot_rows;
diff --git a/source/blender/editors/space_view3d/view3d_draw.c
b/source/blender/editors/space_view3d/view3d_draw.c
index 964317f695e..74554e8d62b 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -1183,7 +1183,7 @@ static void draw_selected_name(Scene *scene, Object *ob,
rcti *rect)
/**
* Information drawn on top of the solid plates and composed data
*/
-void view3d_draw_region_info(const bContext *C, ARegion *ar, const int offset)
+void view3d_draw_region_info(const bContext *C, ARegion *ar, const int
UNUSED(offset))
{
RegionView3D *rv3d = ar->regiondata;
View3D *v3d = CTX_wm_view3d(C);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
