Commit: 95dd478e47523c3667d4a9de275707bc91975e30
Author: Campbell Barton
Date: Wed Apr 12 12:05:11 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB95dd478e47523c3667d4a9de275707bc91975e30
Cleanup: line length
Avoid right-shift
===================================================================
M source/blender/draw/modes/edit_mesh_mode.c
===================================================================
diff --git a/source/blender/draw/modes/edit_mesh_mode.c
b/source/blender/draw/modes/edit_mesh_mode.c
index dc5c109757b..1e4c5836119 100644
--- a/source/blender/draw/modes/edit_mesh_mode.c
+++ b/source/blender/draw/modes/edit_mesh_mode.c
@@ -135,85 +135,105 @@ static void EDIT_MESH_engine_init(void *vedata)
float *viewport_size = DRW_viewport_size_get();
- DRWFboTexture tex[2] = {{&txl->occlude_wire_depth_tx, DRW_BUF_DEPTH_24,
0},
- {&txl->occlude_wire_color_tx, DRW_BUF_RGBA_8,
DRW_TEX_FILTER}};
- DRW_framebuffer_init(&fbl->occlude_wire_fb,
- (int)viewport_size[0], (int)viewport_size[1],
- tex, 2);
+ DRWFboTexture tex[2] = {{
+ &txl->occlude_wire_depth_tx, DRW_BUF_DEPTH_24, 0},
+ {&txl->occlude_wire_color_tx, DRW_BUF_RGBA_8, DRW_TEX_FILTER}
+ };
+ DRW_framebuffer_init(
+ &fbl->occlude_wire_fb,
+ (int)viewport_size[0], (int)viewport_size[1],
+ tex, ARRAY_SIZE(tex));
if (!e_data.overlay_tri_sh) {
- e_data.overlay_tri_sh =
DRW_shader_create_with_lib(datatoc_edit_overlay_vert_glsl,
-
datatoc_edit_overlay_geom_tri_glsl,
-
datatoc_edit_overlay_frag_glsl,
-
datatoc_common_globals_lib_glsl, "#define EDGE_FIX\n");
+ e_data.overlay_tri_sh = DRW_shader_create_with_lib(
+ datatoc_edit_overlay_vert_glsl,
+ datatoc_edit_overlay_geom_tri_glsl,
+ datatoc_edit_overlay_frag_glsl,
+ datatoc_common_globals_lib_glsl, "#define EDGE_FIX\n");
}
if (!e_data.overlay_tri_fast_sh) {
- e_data.overlay_tri_fast_sh =
DRW_shader_create_with_lib(datatoc_edit_overlay_vert_glsl,
-
datatoc_edit_overlay_geom_tri_glsl,
-
datatoc_edit_overlay_frag_glsl,
-
datatoc_common_globals_lib_glsl, NULL);
+ e_data.overlay_tri_fast_sh = DRW_shader_create_with_lib(
+ datatoc_edit_overlay_vert_glsl,
+ datatoc_edit_overlay_geom_tri_glsl,
+ datatoc_edit_overlay_frag_glsl,
+ datatoc_common_globals_lib_glsl, NULL);
}
if (!e_data.overlay_tri_vcol_sh) {
- e_data.overlay_tri_vcol_sh =
DRW_shader_create_with_lib(datatoc_edit_overlay_vert_glsl,
-
datatoc_edit_overlay_geom_tri_glsl,
-
datatoc_edit_overlay_frag_glsl,
-
datatoc_common_globals_lib_glsl, "#define EDGE_FIX\n"
-
"#define VERTEX_SELECTION\n");
+ e_data.overlay_tri_vcol_sh = DRW_shader_create_with_lib(
+ datatoc_edit_overlay_vert_glsl,
+ datatoc_edit_overlay_geom_tri_glsl,
+ datatoc_edit_overlay_frag_glsl,
+ datatoc_common_globals_lib_glsl,
+ "#define EDGE_FIX\n"
+ "#define VERTEX_SELECTION\n");
}
if (!e_data.overlay_tri_vcol_fast_sh) {
- e_data.overlay_tri_vcol_fast_sh =
DRW_shader_create_with_lib(datatoc_edit_overlay_vert_glsl,
-
datatoc_edit_overlay_geom_tri_glsl,
-
datatoc_edit_overlay_frag_glsl,
-
datatoc_common_globals_lib_glsl, "#define VERTEX_SELECTION\n");
+ e_data.overlay_tri_vcol_fast_sh = DRW_shader_create_with_lib(
+ datatoc_edit_overlay_vert_glsl,
+ datatoc_edit_overlay_geom_tri_glsl,
+ datatoc_edit_overlay_frag_glsl,
+ datatoc_common_globals_lib_glsl,
+ "#define VERTEX_SELECTION\n");
}
if (!e_data.overlay_edge_sh) {
- e_data.overlay_edge_sh =
DRW_shader_create_with_lib(datatoc_edit_overlay_vert_glsl,
-
datatoc_edit_overlay_geom_edge_glsl,
-
datatoc_edit_overlay_frag_glsl,
-
datatoc_common_globals_lib_glsl, NULL);
+ e_data.overlay_edge_sh = DRW_shader_create_with_lib(
+ datatoc_edit_overlay_vert_glsl,
+ datatoc_edit_overlay_geom_edge_glsl,
+ datatoc_edit_overlay_frag_glsl,
+ datatoc_common_globals_lib_glsl, NULL);
}
if (!e_data.overlay_edge_vcol_sh) {
- e_data.overlay_edge_vcol_sh =
DRW_shader_create_with_lib(datatoc_edit_overlay_vert_glsl,
-
datatoc_edit_overlay_geom_edge_glsl,
-
datatoc_edit_overlay_frag_glsl,
-
datatoc_common_globals_lib_glsl, "#define VERTEX_SELECTION\n");
+ e_data.overlay_edge_vcol_sh = DRW_shader_create_with_lib(
+ datatoc_edit_overlay_vert_glsl,
+ datatoc_edit_overlay_geom_edge_glsl,
+ datatoc_edit_overlay_frag_glsl,
+ datatoc_common_globals_lib_glsl,
+ "#define VERTEX_SELECTION\n");
}
if (!e_data.overlay_vert_sh) {
- e_data.overlay_vert_sh =
DRW_shader_create_with_lib(datatoc_edit_overlay_loosevert_vert_glsl, NULL,
-
datatoc_edit_overlay_frag_glsl,
-
datatoc_common_globals_lib_glsl, "#define VERTEX_SELECTION\n");
+ e_data.overlay_vert_sh = DRW_shader_create_with_lib(
+ datatoc_edit_overlay_loosevert_vert_glsl, NULL,
+ datatoc_edit_overlay_frag_glsl,
+ datatoc_common_globals_lib_glsl,
+ "#define VERTEX_SELECTION\n");
}
if (!e_data.overlay_facedot_sh) {
- e_data.overlay_facedot_sh =
DRW_shader_create_with_lib(datatoc_edit_overlay_facedot_vert_glsl, NULL,
-
datatoc_edit_overlay_facedot_frag_glsl,
-
datatoc_common_globals_lib_glsl, NULL);
+ e_data.overlay_facedot_sh = DRW_shader_create_with_lib(
+ datatoc_edit_overlay_facedot_vert_glsl, NULL,
+ datatoc_edit_overlay_facedot_frag_glsl,
+ datatoc_common_globals_lib_glsl, NULL);
}
if (!e_data.overlay_mix_sh) {
e_data.overlay_mix_sh =
DRW_shader_create_fullscreen(datatoc_edit_overlay_mix_frag_glsl, NULL);
}
if (!e_data.overlay_facefill_sh) {
- e_data.overlay_facefill_sh =
DRW_shader_create_with_lib(datatoc_edit_overlay_facefill_vert_glsl, NULL,
-
datatoc_edit_overlay_facefill_frag_glsl,
-
datatoc_common_globals_lib_glsl, NULL);
+ e_data.overlay_facefill_sh = DRW_shader_create_with_lib(
+ datatoc_edit_overlay_facefill_vert_glsl, NULL,
+ datatoc_edit_overlay_facefill_frag_glsl,
+ datatoc_common_globals_lib_glsl, NULL);
}
if (!e_data.normals_face_sh) {
- e_data.normals_face_sh =
DRW_shader_create(datatoc_edit_normals_vert_glsl,
-
datatoc_edit_normals_geom_glsl,
-
datatoc_gpu_shader_uniform_color_frag_glsl, "#define FACE_NORMALS\n");
+ e_data.normals_face_sh = DRW_shader_create(
+ datatoc_edit_normals_vert_glsl,
+ datatoc_edit_normals_geom_glsl,
+ datatoc_gpu_shader_uniform_color_frag_glsl,
+ "#define FACE_NORMALS\n");
}
if (!e_data.normals_sh) {
- e_data.normals_sh =
DRW_shader_create(datatoc_edit_normals_vert_glsl,
-
datatoc_edit_normals_geom_glsl,
-
datatoc_gpu_shader_uniform_color_frag_glsl, NULL);
+ e_data.normals_sh = DRW_shader_create(
+ datatoc_edit_normals_vert_glsl,
+ datatoc_edit_normals_geom_glsl,
+ datatoc_gpu_shader_uniform_color_frag_glsl, NULL);
}
if (!e_data.depth_sh) {
e_data.depth_sh = DRW_shader_create_3D_depth_only();
}
}
-static DRWPass *edit_mesh_create_overlay_pass(DRWShadingGroup **face_shgrp,
DRWShadingGroup **ledges_shgrp,
- DRWShadingGroup **lverts_shgrp,
DRWShadingGroup **facedot_shgrp,
- float *faceAlpha, DRWState
statemod)
+static DRWPass *edit_mesh_create_overlay_pass(
+ DRWShadingGroup **face_shgrp, DRWShadingGroup **ledges_shgrp,
+ DRWShadingGroup **lverts_shgrp, DRWShadingGroup **facedot_shgrp,
+ float *faceAlpha, DRWState statemod)
{
static struct GPUShader *tri_sh, *ledge_sh;
const struct bContext *C = DRW_get_context();
@@ -238,7 +258,9 @@ static DRWPass
*edit_mesh_create_overlay_pass(DRWShadingGroup **face_shgrp, DRWS
tri_sh = e_data.overlay_tri_sh;
}
- DRWPass *pass = DRW_pass_create("Edit Mesh Face Overlay Pass",
DRW_STATE_WRITE_COLOR | DRW_STATE_POINT | statemod);
+ DRWPass *pass = DRW_pass_create(
+ "Edit Mesh Face Overlay Pass",
+ DRW_STATE_WRITE_COLOR | DRW_STATE_POINT | statemod);
*face_shgrp = DRW_shgroup_create(tri_sh, pass);
DRW_shgroup_uniform_block(*face_shgrp, "globalsBlock", globals_ubo, 0);
@@ -285,13 +307,17 @@ static void EDIT_MESH_cache_init(void *vedata)
{
/* Complementary Depth Pass */
- psl->depth_hidden_wire = DRW_pass_create("Depth Pass Hidden
Wire", DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS | DRW_STATE_CULL_BACK);
+ psl->depth_hidden_wire = DRW_pass_create(
+ "Depth Pass Hidden Wire",
+ DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS |
DRW_STATE_CULL_BACK);
stl->g_data->depth_shgrp_hidden_wire =
DRW_shgroup_create(e_data.depth_sh, psl->depth_hidden_wire);
}
{
/* Normals */
- psl->normals = DRW_pass_create("Edit Mesh Normals Pass",
DRW_STATE_WRITE_DEPTH | DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_LESS);
+ psl->normals = DRW_pass_create(
+ "Edit Mesh Normals Pass",
+ DRW_STATE_WRITE_DEPTH | DRW_STATE_WRITE_COLOR |
DRW_STATE_DEPTH_LESS);
stl->g_data->fnor
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
