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

Cleanup: style

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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);

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

@@ -1157,7 +1157,8 @@ static bool gpencil_fill_poll(bContext *C)
if (sa->spacetype == SPACE_VIEW3D) {
if ((obact == NULL) ||
(obact->type != OB_GPENCIL) ||
(obact->mode != OB_MODE_PAINT_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, "");