forked from bartvdbraak/blender
Cleanup: clang-format
This commit is contained in:
parent
e10884323e
commit
20c5f677d7
1
extern/draco/dracoenc/cmake/util.cmake
vendored
1
extern/draco/dracoenc/cmake/util.cmake
vendored
@ -71,4 +71,3 @@ macro (set_variable_if_unset var_name default_value)
|
|||||||
endmacro ()
|
endmacro ()
|
||||||
|
|
||||||
endif() # DRACO_CMAKE_UTIL_CMAKE_
|
endif() # DRACO_CMAKE_UTIL_CMAKE_
|
||||||
|
|
||||||
|
@ -1027,8 +1027,8 @@ DynamicPaintSurface *dynamicPaint_createNewSurface(DynamicPaintCanvasSettings *c
|
|||||||
|
|
||||||
/* Set initial values */
|
/* Set initial values */
|
||||||
surface->flags = MOD_DPAINT_ANTIALIAS | MOD_DPAINT_MULALPHA | MOD_DPAINT_DRY_LOG |
|
surface->flags = MOD_DPAINT_ANTIALIAS | MOD_DPAINT_MULALPHA | MOD_DPAINT_DRY_LOG |
|
||||||
MOD_DPAINT_DISSOLVE_LOG | MOD_DPAINT_ACTIVE |
|
MOD_DPAINT_DISSOLVE_LOG | MOD_DPAINT_ACTIVE | MOD_DPAINT_OUT1 |
|
||||||
MOD_DPAINT_OUT1 | MOD_DPAINT_USE_DRYING;
|
MOD_DPAINT_USE_DRYING;
|
||||||
surface->effect = 0;
|
surface->effect = 0;
|
||||||
surface->effect_ui = 1;
|
surface->effect_ui = 1;
|
||||||
|
|
||||||
|
@ -62,7 +62,7 @@ void main()
|
|||||||
box = check_box_point(centered, vec2(gradient_s / 2.0));
|
box = check_box_point(centered, vec2(gradient_s / 2.0));
|
||||||
if ((box.x > 1.0) || (box.y > 1.0)) {
|
if ((box.x > 1.0) || (box.y > 1.0)) {
|
||||||
discard;
|
discard;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
vec4 tmp_color = texture2D(myTexture, mTexCoord);
|
vec4 tmp_color = texture2D(myTexture, mTexCoord);
|
||||||
|
@ -79,7 +79,7 @@ void main()
|
|||||||
float d = abs(mTexCoord.y - 0.5) * (1.1 - gradient_f);
|
float d = abs(mTexCoord.y - 0.5) * (1.1 - gradient_f);
|
||||||
float alpha = 1.0 - clamp((fragColor.a - (d * 2.0)), 0.03, 1.0);
|
float alpha = 1.0 - clamp((fragColor.a - (d * 2.0)), 0.03, 1.0);
|
||||||
fragColor.a = smoothstep(fragColor.a, 0.0, alpha);
|
fragColor.a = smoothstep(fragColor.a, 0.0, alpha);
|
||||||
|
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -3386,8 +3386,7 @@ static void mesh_create_edit_facedots(MeshRenderData *rdata, GPUVertBuf *vbo_fac
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mesh_create_edit_mesh_analysis(MeshRenderData *rdata,
|
static void mesh_create_edit_mesh_analysis(MeshRenderData *rdata, GPUVertBuf *vbo_mesh_analysis)
|
||||||
GPUVertBuf *vbo_mesh_analysis)
|
|
||||||
{
|
{
|
||||||
const MeshStatVis *mesh_stat_vis = &rdata->toolsettings->statvis;
|
const MeshStatVis *mesh_stat_vis = &rdata->toolsettings->statvis;
|
||||||
|
|
||||||
|
@ -265,4 +265,4 @@ struct GPUBatch *DRW_metaball_batch_cache_get_edge_detection(struct Object *ob,
|
|||||||
}
|
}
|
||||||
|
|
||||||
return cache->edge_detection;
|
return cache->edge_detection;
|
||||||
}
|
}
|
||||||
|
@ -696,7 +696,7 @@ static void EDIT_MESH_cache_populate(void *vedata, Object *ob)
|
|||||||
if (do_show_mesh_analysis) {
|
if (do_show_mesh_analysis) {
|
||||||
Mesh *me = (Mesh *)ob->data;
|
Mesh *me = (Mesh *)ob->data;
|
||||||
BMEditMesh *embm = me->edit_mesh;
|
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);
|
(embm->mesh_eval_final->runtime.is_original == true);
|
||||||
if (is_original) {
|
if (is_original) {
|
||||||
geom = DRW_cache_mesh_surface_mesh_analysis_get(ob);
|
geom = DRW_cache_mesh_surface_mesh_analysis_get(ob);
|
||||||
|
Loading…
Reference in New Issue
Block a user