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

Cleanup: argument wrapping indentation

Browse Source
This commit is contained in:
Campbell Barton
2018-12-20 08:01:39 +11:00
parent 1ce9a142b6
commit 65bc931306
14 changed files with 160 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/blenkernel/intern/scene.c
View File

@@ -699,18 +699,20 @@ void BKE_scene_init(Scene *sce)
sce->toolsettings->gp_sculpt.cur_falloff = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
CurveMapping *gp_falloff_curve = sce->toolsettings->gp_sculpt.cur_falloff;
curvemapping_initialize(gp_falloff_curve);
curvemap_reset(gp_falloff_curve->cm,
&gp_falloff_curve->clipr,
CURVE_PRESET_GAUSS,
CURVEMAP_SLOPE_POSITIVE);
curvemap_reset(
gp_falloff_curve->cm,
&gp_falloff_curve->clipr,
CURVE_PRESET_GAUSS,
CURVEMAP_SLOPE_POSITIVE);
sce->toolsettings->gp_sculpt.cur_primitive = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
CurveMapping *gp_primitive_curve = sce->toolsettings->gp_sculpt.cur_primitive;
curvemapping_initialize(gp_primitive_curve);
curvemap_reset(gp_primitive_curve->cm,
&gp_primitive_curve->clipr,
CURVE_PRESET_BELL,
CURVEMAP_SLOPE_POSITIVE);
curvemap_reset(
gp_primitive_curve->cm,
&gp_primitive_curve->clipr,
CURVE_PRESET_BELL,
CURVEMAP_SLOPE_POSITIVE);
sce->physics_settings.gravity[0] = 0.0f;
sce->physics_settings.gravity[1] = 0.0f;

5
source/blender/blenkernel/intern/softbody.c
View File

@@ -875,8 +875,9 @@ static void free_scratch(SoftBody *sb)
if (sb->scratch) {
/* todo make sure everything is cleaned up nicly */
if (sb->scratch->colliderhash) {
BLI_ghash_free(sb->scratch->colliderhash, NULL,
(GHashValFreeFP) ccd_mesh_free); /*this hoepfully will free all caches*/
BLI_ghash_free(
sb->scratch->colliderhash, NULL,
(GHashValFreeFP) ccd_mesh_free); /*this hoepfully will free all caches*/
sb->scratch->colliderhash = NULL;
}
if (sb->scratch->bodyface) {

9
source/blender/blenloader/intern/versioning_280.c
View File

@@ -2511,10 +2511,11 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
if ((gset) && (gset->cur_primitive == NULL)) {
gset->cur_primitive = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
curvemapping_initialize(gset->cur_primitive);
curvemap_reset(gset->cur_primitive->cm,
&gset->cur_primitive->clipr,
CURVE_PRESET_BELL,
CURVEMAP_SLOPE_POSITIVE);
curvemap_reset(
gset->cur_primitive->cm,
&gset->cur_primitive->clipr,
CURVE_PRESET_BELL,
CURVEMAP_SLOPE_POSITIVE);
}
}
}

29
source/blender/blenloader/intern/versioning_defaults.c
View File

@@ -195,29 +195,32 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template)
ts->gp_sculpt.cur_falloff = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
CurveMapping *gp_falloff_curve = ts->gp_sculpt.cur_falloff;
curvemapping_initialize(gp_falloff_curve);
curvemap_reset(gp_falloff_curve->cm,
&gp_falloff_curve->clipr,
CURVE_PRESET_GAUSS,
CURVEMAP_SLOPE_POSITIVE);
curvemap_reset(
gp_falloff_curve->cm,
&gp_falloff_curve->clipr,
CURVE_PRESET_GAUSS,
CURVEMAP_SLOPE_POSITIVE);
}
if (ts->gp_sculpt.cur_primitive == NULL) {
ts->gp_sculpt.cur_primitive = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
CurveMapping *gp_primitive_curve = ts->gp_sculpt.cur_primitive;
curvemapping_initialize(gp_primitive_curve);
curvemap_reset(gp_primitive_curve->cm,
&gp_primitive_curve->clipr,
CURVE_PRESET_BELL,
CURVEMAP_SLOPE_POSITIVE);
curvemap_reset(
gp_primitive_curve->cm,
&gp_primitive_curve->clipr,
CURVE_PRESET_BELL,
CURVEMAP_SLOPE_POSITIVE);
}
}
}
/* For all builtin templates shipped with Blender. */
bool builtin_template = !app_template ||
STREQ(app_template, "2D_Animation") ||
STREQ(app_template, "Sculpting") ||
STREQ(app_template, "VFX") ||
STREQ(app_template, "Video_Editing");
bool builtin_template = (
!app_template ||
STREQ(app_template, "2D_Animation") ||
STREQ(app_template, "Sculpting") ||
STREQ(app_template, "VFX") ||
STREQ(app_template, "Video_Editing"));
if (builtin_template) {
/* Clear all tools to use default options instead, ignore the tool saved in the file. */

8
source/blender/collada/BCAnimationCurve.cpp
View File

@@ -386,10 +386,10 @@ void BCAnimationCurve::add_value(const float val, const int frame_index)
FCurve *fcu = get_edit_fcurve();
fcu->auto_smoothing = FCURVE_SMOOTH_CONT_ACCEL;
insert_vert_fcurve(
fcu,
frame_index, val,
BEZT_KEYTYPE_KEYFRAME,
INSERTKEY_NOFLAGS);
fcu,
frame_index, val,
BEZT_KEYTYPE_KEYFRAME,
INSERTKEY_NOFLAGS);
if (fcu->totvert == 1) {
init_range(val);

10
source/blender/collada/ControllerExporter.cpp
View File

@@ -196,11 +196,11 @@ void ControllerExporter::export_skin_controller(Object *ob, Object *ob_arm)
}
me = bc_get_mesh_copy(
blender_context,
ob,
this->export_settings->export_mesh_type,
this->export_settings->apply_modifiers,
this->export_settings->triangulate);
blender_context,
ob,
this->export_settings->export_mesh_type,
this->export_settings->apply_modifiers,
this->export_settings->triangulate);
std::string controller_name = id_name(ob_arm);
std::string controller_id = get_controller_id(ob_arm, ob);

38
source/blender/draw/engines/gpencil/gpencil_draw_utils.c
View File

@@ -97,8 +97,8 @@ static void gpencil_calc_vertex(
/* verify time modifiers */
if ((time_remap) && (!stl->storage->simplify_modif)) {
int remap_cfra = BKE_gpencil_time_modifier(
draw_ctx->depsgraph, draw_ctx->scene, ob, gpl, cfra_eval,
stl->storage->is_render);
draw_ctx->depsgraph, draw_ctx->scene, ob, gpl, cfra_eval,
stl->storage->is_render);
init_gpf = BKE_gpencil_layer_getframe(gpl, remap_cfra, GP_GETFRAME_USE_PREV);
}
else {
@@ -1238,9 +1238,9 @@ void DRW_gpencil_populate_buffer_strokes(GPENCIL_e_data *e_data, void *vedata, T
if (gp_style->flag & GP_STYLE_STROKE_SHOW) {
DRW_shgroup_call_add(
stl->g_data->shgrps_drawing_stroke,
e_data->batch_buffer_stroke,
stl->storage->unit_matrix);
stl->g_data->shgrps_drawing_stroke,
e_data->batch_buffer_stroke,
stl->storage->unit_matrix);
}
if ((gpd->runtime.sbuffer_size >= 3) &&
@@ -1265,9 +1265,9 @@ void DRW_gpencil_populate_buffer_strokes(GPENCIL_e_data *e_data, void *vedata, T
e_data->batch_buffer_fill = DRW_gpencil_get_buffer_fill_geom(gpd);
DRW_shgroup_call_add(
stl->g_data->shgrps_drawing_fill,
e_data->batch_buffer_fill,
stl->storage->unit_matrix);
stl->g_data->shgrps_drawing_fill,
e_data->batch_buffer_fill,
stl->storage->unit_matrix);
stl->storage->buffer_fill = true;
}
stl->storage->buffer_stroke = true;
@@ -1297,9 +1297,9 @@ void DRW_gpencil_populate_buffer_strokes(GPENCIL_e_data *e_data, void *vedata, T
e_data->batch_buffer_ctrlpoint = DRW_gpencil_get_buffer_ctrlpoint_geom(gpd);
DRW_shgroup_call_add(
shgrp,
e_data->batch_buffer_ctrlpoint,
stl->storage->unit_matrix);
shgrp,
e_data->batch_buffer_ctrlpoint,
stl->storage->unit_matrix);
stl->storage->buffer_ctrlpoint = true;
}
@@ -1438,10 +1438,10 @@ static void DRW_gpencil_shgroups_create(
const int len = elm->vertex_idx - start_edit;
/* use always the same group */
DRW_shgroup_call_range_add(
stl->g_data->shgrps_edit_point,
cache->b_edit.batch,
(!cache_ob->is_dup_ob) ? gpf->runtime.viewmatrix : cache_ob->obmat,
start_edit, len);
stl->g_data->shgrps_edit_point,
cache->b_edit.batch,
(!cache_ob->is_dup_ob) ? gpf->runtime.viewmatrix : cache_ob->obmat,
start_edit, len);
start_edit = elm->vertex_idx;
}
@@ -1453,10 +1453,10 @@ static void DRW_gpencil_shgroups_create(
const int len = elm->vertex_idx - start_edlin;
/* use always the same group */
DRW_shgroup_call_range_add(
stl->g_data->shgrps_edit_line,
cache->b_edlin.batch,
(!cache_ob->is_dup_ob) ? gpf->runtime.viewmatrix : cache_ob->obmat,
start_edlin, len);
stl->g_data->shgrps_edit_line,
cache->b_edlin.batch,
(!cache_ob->is_dup_ob) ? gpf->runtime.viewmatrix : cache_ob->obmat,
start_edlin, len);
start_edlin = elm->vertex_idx;
}

51
source/blender/draw/engines/gpencil/gpencil_engine.c
View File

@@ -125,10 +125,11 @@ static void GPENCIL_create_framebuffers(void *vedata)
if (stl->storage->framebuffer_flag & GP_FRAMEBUFFER_BASIC) {
/* temp textures for ping-pong buffers */
e_data.temp_depth_tx_a = DRW_texture_pool_query_2D(
size[0], size[1], GPU_DEPTH_COMPONENT24,
&draw_engine_gpencil_type);
e_data.temp_color_tx_a = DRW_texture_pool_query_2D(size[0], size[1], fb_format,
&draw_engine_gpencil_type);
size[0], size[1], GPU_DEPTH_COMPONENT24,
&draw_engine_gpencil_type);
e_data.temp_color_tx_a = DRW_texture_pool_query_2D(
size[0], size[1], fb_format,
&draw_engine_gpencil_type);
GPU_framebuffer_ensure_config(
&fbl->temp_fb_a, {
GPU_ATTACHMENT_TEXTURE(e_data.temp_depth_tx_a),
@@ -136,11 +137,11 @@ static void GPENCIL_create_framebuffers(void *vedata)
});
e_data.temp_depth_tx_b = DRW_texture_pool_query_2D(
size[0], size[1], GPU_DEPTH_COMPONENT24,
&draw_engine_gpencil_type);
size[0], size[1], GPU_DEPTH_COMPONENT24,
&draw_engine_gpencil_type);
e_data.temp_color_tx_b = DRW_texture_pool_query_2D(
size[0], size[1], fb_format,
&draw_engine_gpencil_type);
size[0], size[1], fb_format,
&draw_engine_gpencil_type);
GPU_framebuffer_ensure_config(
&fbl->temp_fb_b, {
GPU_ATTACHMENT_TEXTURE(e_data.temp_depth_tx_b),
@@ -149,11 +150,11 @@ static void GPENCIL_create_framebuffers(void *vedata)
/* used for FX effects and Layer blending */
e_data.temp_depth_tx_fx = DRW_texture_pool_query_2D(
size[0], size[1], GPU_DEPTH_COMPONENT24,
&draw_engine_gpencil_type);
size[0], size[1], GPU_DEPTH_COMPONENT24,
&draw_engine_gpencil_type);
e_data.temp_color_tx_fx = DRW_texture_pool_query_2D(
size[0], size[1], fb_format,
&draw_engine_gpencil_type);
size[0], size[1], fb_format,
&draw_engine_gpencil_type);
GPU_framebuffer_ensure_config(
&fbl->temp_fb_fx, {
GPU_ATTACHMENT_TEXTURE(e_data.temp_depth_tx_fx),
@@ -164,11 +165,11 @@ static void GPENCIL_create_framebuffers(void *vedata)
/* background framebuffer to speed up drawing process (always 16 bits) */
if (stl->storage->framebuffer_flag & GP_FRAMEBUFFER_DRAW) {
e_data.background_depth_tx = DRW_texture_pool_query_2D(
size[0], size[1], GPU_DEPTH_COMPONENT24,
&draw_engine_gpencil_type);
size[0], size[1], GPU_DEPTH_COMPONENT24,
&draw_engine_gpencil_type);
e_data.background_color_tx = DRW_texture_pool_query_2D(
size[0], size[1], GPU_RGBA32F,
&draw_engine_gpencil_type);
size[0], size[1], GPU_RGBA32F,
&draw_engine_gpencil_type);
GPU_framebuffer_ensure_config(
&fbl->background_fb, {
GPU_ATTACHMENT_TEXTURE(e_data.background_depth_tx),
@@ -624,9 +625,9 @@ void GPENCIL_cache_populate(void *vedata, Object *ob)
}
DRW_shgroup_call_add(
stl->g_data->shgrps_grid,
e_data.batch_grid,
stl->storage->grid_matrix);
stl->g_data->shgrps_grid,
e_data.batch_grid,
stl->storage->grid_matrix);
}
}
}
@@ -829,9 +830,9 @@ void GPENCIL_draw_scene(void *ved)
GPU_framebuffer_bind(fbl->temp_fb_fx);
GPU_framebuffer_clear_color_depth(fbl->temp_fb_fx, clearcol, 1.0f);
gpencil_draw_pass_range(
fbl, stl, psl, txl, fbl->temp_fb_fx,
init_shgrp, end_shgrp,
is_last);
fbl, stl, psl, txl, fbl->temp_fb_fx,
init_shgrp, end_shgrp,
is_last);
/* Blend A texture and FX texture */
GPU_framebuffer_bind(fbl->temp_fb_b);
@@ -858,9 +859,9 @@ void GPENCIL_draw_scene(void *ved)
}
/* last group */
gpencil_draw_pass_range(
fbl, stl, psl, txl, fbl->temp_fb_a,
init_shgrp, end_shgrp,
true);
fbl, stl, psl, txl, fbl->temp_fb_a,
init_shgrp, end_shgrp,
true);
}
/* Current buffer drawing */

6
source/blender/editors/gpencil/gpencil_primitive.c
View File

@@ -904,9 +904,9 @@ static void gp_primitive_update_strokes(bContext *C, tGPDprimitive *tgpi)
/* convert screen-coordinates to 3D coordinates */
gp_stroke_convertcoords_tpoint(
tgpi->scene, tgpi->ar, tgpi->ob, tgpi->gpl,
p2d, depth_arr ? depth_arr + i : NULL,
&pt->x);
tgpi->scene, tgpi->ar, tgpi->ob, tgpi->gpl,
p2d, depth_arr ? depth_arr + i : NULL,
&pt->x);
pt->pressure = pressure;
pt->strength = strength;

9
source/blender/editors/gpencil/gpencil_utils.c
View File

@@ -1257,10 +1257,11 @@ void ED_gpencil_add_defaults(bContext *C)
ts->gp_sculpt.cur_falloff = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
CurveMapping *gp_falloff_curve = ts->gp_sculpt.cur_falloff;
curvemapping_initialize(gp_falloff_curve);
curvemap_reset(gp_falloff_curve->cm,
&gp_falloff_curve->clipr,
CURVE_PRESET_GAUSS,
CURVEMAP_SLOPE_POSITIVE);
curvemap_reset(
gp_falloff_curve->cm,
&gp_falloff_curve->clipr,
CURVE_PRESET_GAUSS,
CURVEMAP_SLOPE_POSITIVE);
}
}

54
source/blender/editors/io/io_collada.c
View File

@@ -650,36 +650,40 @@ void WM_OT_collada_import(wmOperatorType *ot)
ot, FILE_TYPE_FOLDER | FILE_TYPE_COLLADA, FILE_BLENDER, FILE_OPENFILE,
WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY, FILE_SORT_ALPHA);
RNA_def_boolean(ot->srna,
"import_units", 0, "Import Units",
"If disabled match import to Blender's current Unit settings, "
"otherwise use the settings from the Imported scene");
RNA_def_boolean(
ot->srna,
"import_units", 0, "Import Units",
"If disabled match import to Blender's current Unit settings, "
"otherwise use the settings from the Imported scene");
RNA_def_boolean(ot->srna,
"fix_orientation", 0, "Fix Leaf Bones",
"Fix Orientation of Leaf Bones (Collada does only support Joints)");
RNA_def_boolean(
ot->srna,
"fix_orientation", 0, "Fix Leaf Bones",
"Fix Orientation of Leaf Bones (Collada does only support Joints)");
RNA_def_boolean(ot->srna,
"find_chains", 0, "Find Bone Chains",
"Find best matching Bone Chains and ensure bones in chain are connected");
RNA_def_boolean(
ot->srna,
"find_chains", 0, "Find Bone Chains",
"Find best matching Bone Chains and ensure bones in chain are connected");
RNA_def_boolean(ot->srna,
"auto_connect", 0, "Auto Connect",
"Set use_connect for parent bones which have exactly one child bone");
RNA_def_boolean(
ot->srna,
"auto_connect", 0, "Auto Connect",
"Set use_connect for parent bones which have exactly one child bone");
RNA_def_int(ot->srna,
"min_chain_length",
0,
0,
INT_MAX,
"Minimum Chain Length",
"When searching Bone Chains disregard chains of length below this value",
0,
INT_MAX);
RNA_def_int(
ot->srna,
"min_chain_length",
0,
0, INT_MAX,
"Minimum Chain Length",
"When searching Bone Chains disregard chains of length below this value",
0, INT_MAX);
RNA_def_boolean(ot->srna,
"keep_bind_info", 0, "Keep Bind Info",
"Store Bindpose information in custom bone properties for later use during Collada export");
RNA_def_boolean(
ot->srna,
"keep_bind_info", 0, "Keep Bind Info",
"Store Bindpose information in custom bone properties for later use during Collada export");
}
#endif

56
source/blender/editors/object/object_modifier.c
View File

@@ -1593,10 +1593,10 @@ static int skin_loose_mark_clear_exec(bContext *C, wmOperator *op)
BM_ITER_MESH (bm_vert, &bm_iter, bm, BM_VERTS_OF_MESH) {
if (BM_elem_flag_test(bm_vert, BM_ELEM_SELECT)) {
MVertSkin *vs = CustomData_bmesh_get(&bm->vdata,
bm_vert->head.data,
CD_MVERT_SKIN);
MVertSkin *vs = CustomData_bmesh_get(
&bm->vdata,
bm_vert->head.data,
CD_MVERT_SKIN);
switch (action) {
case SKIN_LOOSE_MARK:
@@ -1650,9 +1650,10 @@ static int skin_radii_equalize_exec(bContext *C, wmOperator *UNUSED(op))
BM_ITER_MESH (bm_vert, &bm_iter, bm, BM_VERTS_OF_MESH) {
if (BM_elem_flag_test(bm_vert, BM_ELEM_SELECT)) {
MVertSkin *vs = CustomData_bmesh_get(&bm->vdata,
bm_vert->head.data,
CD_MVERT_SKIN);
MVertSkin *vs = CustomData_bmesh_get(
&bm->vdata,
bm_vert->head.data,
CD_MVERT_SKIN);
float avg = (vs->radius[0] + vs->radius[1]) * 0.5f;
vs->radius[0] = vs->radius[1] = avg;
@@ -1718,13 +1719,14 @@ static void skin_armature_bone_create(Object *skin_ob,
ED_vgroup_vert_add(skin_ob, dg, v, 1, WEIGHT_REPLACE);
}
skin_armature_bone_create(skin_ob,
mvert, medge,
arm,
edges_visited,
emap,
bone,
v);
skin_armature_bone_create(
skin_ob,
mvert, medge,
arm,
edges_visited,
emap,
bone,
v);
}
}
@@ -1748,11 +1750,12 @@ static Object *modifier_skin_armature_create(Depsgraph *depsgraph, Main *bmain,
mvert = me_eval_deform->mvert;
/* add vertex weights to original mesh */
CustomData_add_layer(&me->vdata,
CD_MDEFORMVERT,
CD_CALLOC,
NULL,
me->totvert);
CustomData_add_layer(
&me->vdata,
CD_MDEFORMVERT,
CD_CALLOC,
NULL,
me->totvert);
ViewLayer *view_layer = DEG_get_input_view_layer(depsgraph);
arm_ob = BKE_object_add(bmain, scene, view_layer, OB_ARMATURE, NULL);
@@ -1789,13 +1792,14 @@ static Object *modifier_skin_armature_create(Depsgraph *depsgraph, Main *bmain,
}
if (emap[v].count >= 1) {
skin_armature_bone_create(skin_ob,
mvert, me->medge,
arm,
edges_visited,
emap,
bone,
v);
skin_armature_bone_create(
skin_ob,
mvert, me->medge,
arm,
edges_visited,
emap,
bone,
v);
}
}
}

2
source/blender/editors/uvedit/uvedit_smart_stitch.c
View File

@@ -981,7 +981,7 @@ static void stitch_propagate_uv_final_position(
int face_preview_pos = preview_position[BM_elem_index_get(element_iter->l->f)].data_position;
if (face_preview_pos != STITCH_NO_PREVIEW) {
copy_v2_v2(preview->preview_polys + face_preview_pos + 2 * element_iter->loop_of_poly_index,
final_position[index].uv);
final_position[index].uv);
}
}

7
source/blender/python/intern/bpy_props.c
View File

@@ -3083,9 +3083,10 @@ PyObject *BPy_CollectionProperty(PyObject *self, PyObject *args, PyObject *kw)
return NULL;
if (!RNA_struct_is_a(ptype, &RNA_PropertyGroup)) {
PyErr_Format(PyExc_TypeError,
"CollectionProperty(...) expected an RNA type derived from %.200s",
RNA_struct_ui_name(&RNA_ID), RNA_struct_ui_name(&RNA_PropertyGroup));
PyErr_Format(
PyExc_TypeError,
"CollectionProperty(...) expected an RNA type derived from %.200s",
RNA_struct_ui_name(&RNA_ID), RNA_struct_ui_name(&RNA_PropertyGroup));
return NULL;
}