kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: clang-format

Browse Source
This commit is contained in:
Campbell Barton 2019-04-26 13:03:38 +10:00
parent e10884323e
commit 20c5f677d7
7 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extern/draco/dracoenc/cmake/util.cmake vendored
View File

@ -71,4 +71,3 @@ macro (set_variable_if_unset var_name default_value)
endmacro ()
endif() # DRACO_CMAKE_UTIL_CMAKE_

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

@ -1027,8 +1027,8 @@ DynamicPaintSurface *dynamicPaint_createNewSurface(DynamicPaintCanvasSettings *c
/* Set initial values */
surface->flags = MOD_DPAINT_ANTIALIAS | MOD_DPAINT_MULALPHA | MOD_DPAINT_DRY_LOG |
MOD_DPAINT_DISSOLVE_LOG | MOD_DPAINT_ACTIVE |
MOD_DPAINT_OUT1 | MOD_DPAINT_USE_DRYING;
MOD_DPAINT_DISSOLVE_LOG | MOD_DPAINT_ACTIVE | MOD_DPAINT_OUT1 |
MOD_DPAINT_USE_DRYING;
surface->effect = 0;
surface->effect_ui = 1;

3
source/blender/draw/intern/draw_cache_impl_mesh.c
View File

@ -3386,8 +3386,7 @@ static void mesh_create_edit_facedots(MeshRenderData *rdata, GPUVertBuf *vbo_fac
}
}
static void mesh_create_edit_mesh_analysis(MeshRenderData *rdata,
GPUVertBuf *vbo_mesh_analysis)
static void mesh_create_edit_mesh_analysis(MeshRenderData *rdata, GPUVertBuf *vbo_mesh_analysis)
{
const MeshStatVis *mesh_stat_vis = &rdata->toolsettings->statvis;

2
source/blender/draw/modes/edit_mesh_mode.c
View File

@ -696,7 +696,7 @@ static void EDIT_MESH_cache_populate(void *vedata, Object *ob)
if (do_show_mesh_analysis) {
Mesh *me = (Mesh *)ob->data;
BMEditMesh *embm = me->edit_mesh;
const bool is_original = embm->mesh_eval_final && \
const bool is_original = embm->mesh_eval_final &&
(embm->mesh_eval_final->runtime.is_original == true);
if (is_original) {
geom = DRW_cache_mesh_surface_mesh_analysis_get(ob);