blender
/
blender
134
398
Fork 581
Code Issues 6.3k Pull Requests 757 Projects 19 Wiki Activity

Cleanup: style

This commit is contained in:
Campbell Barton 2019-03-30 07:13:55 +11:00
parent d6747f310f
commit 18d06e8d21
8 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/DerivedMesh.c
View File

@ -995,7 +995,7 @@ static void mesh_calc_modifier_final_normals(
const Mesh *mesh_input,
const CustomData_MeshMasks *dataMask,
const bool sculpt_dyntopo,
Mesh *mesh_final)
Mesh *mesh_final)
{
/* Compute normals. */
const bool do_loop_normals = ((mesh_input->flag & ME_AUTOSMOOTH) != 0 ||
@ -1517,7 +1517,7 @@ bool editbmesh_modifier_is_enabled(Scene *scene, ModifierData *md, bool has_prev
static void editbmesh_calc_modifier_final_normals(
const Mesh *mesh_input,
const CustomData_MeshMasks *dataMask,
Mesh *mesh_final)
Mesh *mesh_final)
{
const bool do_loop_normals = ((mesh_input->flag & ME_AUTOSMOOTH) != 0 ||
(dataMask->lmask & CD_MASK_NORMAL) != 0);

3
source/blender/blenloader/intern/readfile.c
View File

@ -2617,8 +2617,7 @@ static void lib_link_brush(FileData *fd, Main *main)
brush->paint_curve = newlibadr_us(fd, brush->id.lib, brush->paint_curve);
/* link default grease pencil palette */
if (brush->gpencil_settings != NULL)
{
if (brush->gpencil_settings != NULL) {
if (brush->gpencil_settings->flag & GP_BRUSH_MATERIAL_PINNED) {
brush->gpencil_settings->material = newlibadr_us(fd, brush->id.lib, brush->gpencil_settings->material);

2
source/blender/draw/intern/draw_cache_impl_displist.c
View File

@ -621,7 +621,7 @@ void DRW_displist_indexbuf_create_edges_adjacency_lines(struct ListBase *lb, str
EdgeHash *eh = BLI_edgehash_new_ex(__func__, tri_len * 3);
/* pack values to pass to `set_edges_adjacency_lines_indices` function. */
void* thunk[3] = {&elb,eh, r_is_manifold};
void *thunk[3] = {&elb, eh, r_is_manifold};
int v_idx = 0;
for (const DispList *dl = lb->first; dl; dl = dl->next) {
displist_indexbufbuilder_set(

2
source/blender/editors/curve/editcurve.c
View File

@ -4319,7 +4319,7 @@ static bool merge_2_nurb(Curve *cu, ListBase *editnurb, Nurb *nu1, Nurb *nu2)
if (len1 < len2) {
bp2 = &nu2->bp[v * nu2->pntsu];
}
else {
else {
bp2 = &nu2->bp[(nu1->pntsv - v - 1) * nu2->pntsu];
}

5
source/blender/editors/gpencil/gpencil_fill.c
View File

@ -1156,8 +1156,9 @@ static bool gpencil_fill_poll(bContext *C)
ScrArea *sa = CTX_wm_area(C);
if (sa->spacetype == SPACE_VIEW3D) {
if ((obact == NULL) ||
(obact->type != OB_GPENCIL) ||
(obact->mode != OB_MODE_PAINT_GPENCIL)) {
(obact->type != OB_GPENCIL) ||
(obact->mode != OB_MODE_PAINT_GPENCIL))
{
return false;
}

2
source/blender/makesrna/intern/rna_space.c
View File

@ -661,7 +661,7 @@ static void rna_3DViewShading_type_update(Main *bmain, Scene *scene, PointerRNA
DEG_id_tag_update(&ma->id, ID_RECALC_SHADING);
}
View3DShading *shading = (View3DShading*)ptr->data;
View3DShading *shading = ptr->data;
if (shading->type == OB_MATERIAL ||
(shading->type == OB_RENDER && (strcmp(scene->r.engine, RE_engine_id_BLENDER_EEVEE) == 0 ||
strcmp(scene->r.engine, RE_engine_id_CYCLES)))) {

2
source/blender/nodes/shader/nodes/node_shader_tex_coord.c
View File

@ -39,7 +39,7 @@ static int node_shader_gpu_tex_coord(GPUMaterial *mat, bNode *node, bNodeExecDat
Object *ob = (Object *)node->id;
invert_m4_m4(ob->imat, ob->obmat);
GPUNodeLink *inv_obmat = (ob != NULL) ? GPU_uniform((float*)ob->imat) : GPU_builtin(GPU_INVERSE_OBJECT_MATRIX);
GPUNodeLink *inv_obmat = (ob != NULL) ? GPU_uniform(&ob->imat[0][0]) : GPU_builtin(GPU_INVERSE_OBJECT_MATRIX);
GPUNodeLink *orco = GPU_attribute(CD_ORCO, "");
GPUNodeLink *mtface = GPU_attribute(CD_MTFACE, "");

20
source/blender/python/intern/bpy_msgbus.c
View File

@ -247,11 +247,11 @@ static PyObject *bpy_msgbus_subscribe_rna(PyObject *UNUSED(self), PyObject *args
int options = 0;
if (PyTuple_GET_SIZE(args) != 0) {
PyErr_Format(
PyExc_TypeError,
"%s: only keyword arguments are supported",
error_prefix);
return NULL;
PyErr_Format(
PyExc_TypeError,
"%s: only keyword arguments are supported",
error_prefix);
return NULL;
}
static const char *_keywords[] = {
"key",
@ -343,11 +343,11 @@ static PyObject *bpy_msgbus_publish_rna(PyObject *UNUSED(self), PyObject *args,
PyObject *py_sub = NULL;
if (PyTuple_GET_SIZE(args) != 0) {
PyErr_Format(
PyExc_TypeError,
"%s: only keyword arguments are supported",
error_prefix);
return NULL;
PyErr_Format(
PyExc_TypeError,
"%s: only keyword arguments are supported",
error_prefix);
return NULL;
}
static const char *_keywords[] = {
"key",