Cleanup: style
This commit is contained in:
@@ -61,7 +61,7 @@ static ePhysicsRelationType modifier_to_relation_type(unsigned int modifier_type
|
|||||||
return DEG_PHYSICS_SMOKE_COLLISION;
|
return DEG_PHYSICS_SMOKE_COLLISION;
|
||||||
case eModifierType_DynamicPaint:
|
case eModifierType_DynamicPaint:
|
||||||
return DEG_PHYSICS_DYNAMIC_BRUSH;
|
return DEG_PHYSICS_DYNAMIC_BRUSH;
|
||||||
};
|
}
|
||||||
|
|
||||||
BLI_assert(!"Unknown collision modifier type");
|
BLI_assert(!"Unknown collision modifier type");
|
||||||
return DEG_PHYSICS_RELATIONS_NUM;
|
return DEG_PHYSICS_RELATIONS_NUM;
|
||||||
|
|||||||
@@ -858,7 +858,7 @@ static void ui_studiolight_kill_icon_preview_job(wmWindowManager *wm, int icon_i
|
|||||||
icon->obj = NULL;
|
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;
|
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;
|
di->data.buffer.image = img;
|
||||||
|
|
||||||
wmJob *wm_job = WM_jobs_get(wm, CTX_wm_window(C), icon, "StudioLight Icon", 0, WM_JOB_TYPE_STUDIOLIGHT);
|
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;
|
*tmp = icon;
|
||||||
WM_jobs_customdata_set(wm_job, tmp, MEM_freeN);
|
WM_jobs_customdata_set(wm_job, tmp, MEM_freeN);
|
||||||
WM_jobs_timer(wm_job, 0.01, 0, NC_WINDOW);
|
WM_jobs_timer(wm_job, 0.01, 0, NC_WINDOW);
|
||||||
|
|||||||
@@ -3184,12 +3184,12 @@ static void ui_litem_estimate_grid_flow(uiLayout *litem)
|
|||||||
.litem_y = litem->y,
|
.litem_y = litem->y,
|
||||||
.space_x = space_x,
|
.space_x = space_x,
|
||||||
.space_y = space_y,
|
.space_y = space_y,
|
||||||
}),
|
}),
|
||||||
&((UILayoutGridFlowOutput) {
|
&((UILayoutGridFlowOutput) {
|
||||||
.tot_items = &gflow->tot_items,
|
.tot_items = &gflow->tot_items,
|
||||||
.global_avg_w = &avg_w,
|
.global_avg_w = &avg_w,
|
||||||
.global_max_h = &max_h,
|
.global_max_h = &max_h,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
if (gflow->tot_items == 0) {
|
if (gflow->tot_items == 0) {
|
||||||
litem->w = litem->h = 0;
|
litem->w = litem->h = 0;
|
||||||
@@ -3271,11 +3271,11 @@ static void ui_litem_estimate_grid_flow(uiLayout *litem)
|
|||||||
.space_y = space_y,
|
.space_y = space_y,
|
||||||
.tot_columns = gflow->tot_columns,
|
.tot_columns = gflow->tot_columns,
|
||||||
.tot_rows = gflow->tot_rows,
|
.tot_rows = gflow->tot_rows,
|
||||||
}),
|
}),
|
||||||
&((UILayoutGridFlowOutput) {
|
&((UILayoutGridFlowOutput) {
|
||||||
.tot_w = &tot_w,
|
.tot_w = &tot_w,
|
||||||
.tot_h = &tot_h,
|
.tot_h = &tot_h,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
litem->w = tot_w;
|
litem->w = tot_w;
|
||||||
litem->h = tot_h;
|
litem->h = tot_h;
|
||||||
@@ -3319,13 +3319,13 @@ static void ui_litem_layout_grid_flow(uiLayout *litem)
|
|||||||
.space_y = space_y,
|
.space_y = space_y,
|
||||||
.tot_columns = gflow->tot_columns,
|
.tot_columns = gflow->tot_columns,
|
||||||
.tot_rows = gflow->tot_rows,
|
.tot_rows = gflow->tot_rows,
|
||||||
}),
|
}),
|
||||||
&((UILayoutGridFlowOutput) {
|
&((UILayoutGridFlowOutput) {
|
||||||
.cos_x_array = cos_x,
|
.cos_x_array = cos_x,
|
||||||
.cos_y_array = cos_y,
|
.cos_y_array = cos_y,
|
||||||
.widths_array = widths,
|
.widths_array = widths,
|
||||||
.heights_array = heights,
|
.heights_array = heights,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
for (item = litem->items.first, i = 0; item; item = item->next, i++) {
|
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;
|
const int col = gflow->row_major ? i % gflow->tot_columns : i / gflow->tot_rows;
|
||||||
|
|||||||
@@ -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
|
* 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;
|
RegionView3D *rv3d = ar->regiondata;
|
||||||
View3D *v3d = CTX_wm_view3d(C);
|
View3D *v3d = CTX_wm_view3d(C);
|
||||||
|
|||||||
Reference in New Issue
Block a user