Commit: d31276abd005a85ac0b2f4859a2eaabfec7ec0af
Author: Campbell Barton
Date: Fri Jul 14 16:56:02 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBd31276abd005a85ac0b2f4859a2eaabfec7ec0af
Cleanup: long lines
===================================================================
M source/blender/draw/intern/draw_manager.c
M source/blender/draw/modes/edit_armature_mode.c
M source/blender/draw/modes/object_mode.c
M source/blender/draw/modes/paint_vertex_mode.c
M source/blender/draw/modes/pose_mode.c
===================================================================
diff --git a/source/blender/draw/intern/draw_manager.c
b/source/blender/draw/intern/draw_manager.c
index 8f1a2bd888d..e3100d57e02 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -739,7 +739,8 @@ DRWShadingGroup *DRW_shgroup_material_create(struct
GPUMaterial *material, DRWPa
for (GPUInput *input = inputs->first; input; input = input->next) {
/* Textures */
if (input->ima) {
- GPUTexture *tex = GPU_texture_from_blender(input->ima,
input->iuser, input->textarget, input->image_isdata, time, 1);
+ GPUTexture *tex = GPU_texture_from_blender(
+ input->ima, input->iuser, input->textarget,
input->image_isdata, time, 1);
if (input->bindtex) {
DRW_shgroup_uniform_texture(grp,
input->shadername, tex);
@@ -1703,8 +1704,9 @@ static void draw_geometry_execute(DRWShadingGroup
*shgroup, Gwn_Batch *geom)
GWN_batch_draw_stupid_instanced_with_batch(geom,
interface->instance_batch);
}
else if (interface->instance_vbo) {
- GWN_batch_draw_stupid_instanced(geom, interface->instance_vbo,
interface->instance_count, interface->attribs_count,
- interface->attribs_stride,
interface->attribs_size, interface->attribs_loc);
+ GWN_batch_draw_stupid_instanced(
+ geom, interface->instance_vbo,
interface->instance_count, interface->attribs_count,
+ interface->attribs_stride, interface->attribs_size,
interface->attribs_loc);
}
else {
GWN_batch_draw_stupid(geom);
@@ -2130,10 +2132,12 @@ void DRW_framebuffer_init(
if (!*fbotex.tex || is_temp) {
/* Temp textures need to be queried each frame, others
not. */
if (is_temp) {
- *fbotex.tex =
GPU_viewport_texture_pool_query(DST.viewport, engine_type, width, height,
channels, gpu_format);
+ *fbotex.tex = GPU_viewport_texture_pool_query(
+ DST.viewport, engine_type, width,
height, channels, gpu_format);
}
else if (create_fb) {
- *fbotex.tex =
GPU_texture_create_2D_custom(width, height, channels, gpu_format, NULL, NULL);
+ *fbotex.tex = GPU_texture_create_2D_custom(
+ width, height, channels, gpu_format,
NULL, NULL);
}
}
@@ -2684,7 +2688,8 @@ int DRW_draw_region_engine_info_offset(void)
void DRW_draw_region_engine_info(void)
{
const char *info_array_final[MAX_INFO_LINES + 1];
- char info_array[MAX_INFO_LINES][GPU_INFO_SIZE]; /* This should be
maxium number of engines running at the same time. */
+ /* This should be maxium number of engines running at the same time. */
+ char info_array[MAX_INFO_LINES][GPU_INFO_SIZE];
int i = 0;
const DRWContextState *draw_ctx = DRW_context_state_get();
diff --git a/source/blender/draw/modes/edit_armature_mode.c
b/source/blender/draw/modes/edit_armature_mode.c
index 3487ceba141..61a56dab244 100644
--- a/source/blender/draw/modes/edit_armature_mode.c
+++ b/source/blender/draw/modes/edit_armature_mode.c
@@ -92,7 +92,9 @@ static void EDIT_ARMATURE_cache_init(void *vedata)
{
/* Non Meshes Pass (Camera, empties, lamps ...) */
- DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH
| DRW_STATE_DEPTH_LESS | DRW_STATE_BLEND | DRW_STATE_WIRE;
+ DRWState state =
+ DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH |
DRW_STATE_DEPTH_LESS |
+ DRW_STATE_BLEND | DRW_STATE_WIRE;
psl->relationship = DRW_pass_create("Bone Relationship Pass",
state);
/* Relationship Lines */
diff --git a/source/blender/draw/modes/object_mode.c
b/source/blender/draw/modes/object_mode.c
index a3e8b1a2e6c..173580adaef 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -306,15 +306,19 @@ static void OBJECT_engine_init(void *vedata)
}
if (!e_data.part_prim_sh) {
- e_data.part_prim_sh =
DRW_shader_create(datatoc_object_particle_prim_vert_glsl, NULL,
datatoc_object_particle_prim_frag_glsl, NULL);
+ e_data.part_prim_sh = DRW_shader_create(
+ datatoc_object_particle_prim_vert_glsl, NULL,
datatoc_object_particle_prim_frag_glsl, NULL);
}
if (!e_data.part_axis_sh) {
- e_data.part_axis_sh =
DRW_shader_create(datatoc_object_particle_prim_vert_glsl, NULL,
datatoc_object_particle_prim_frag_glsl, "#define USE_AXIS\n");
+ e_data.part_axis_sh = DRW_shader_create(
+ datatoc_object_particle_prim_vert_glsl, NULL,
datatoc_object_particle_prim_frag_glsl,
+ "#define USE_AXIS\n");
}
if (!e_data.part_dot_sh) {
- e_data.part_dot_sh =
DRW_shader_create(datatoc_object_particle_dot_vert_glsl, NULL,
datatoc_object_particle_dot_frag_glsl, NULL);
+ e_data.part_dot_sh = DRW_shader_create(
+ datatoc_object_particle_dot_vert_glsl, NULL,
datatoc_object_particle_dot_frag_glsl, NULL);
}
{
@@ -1072,7 +1076,10 @@ static void OBJECT_cache_init(void *vedata)
{
/* Particle Pass */
- psl->particle = DRW_pass_create("Particle Pass",
DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS |
DRW_STATE_POINT | DRW_STATE_BLEND);
+ psl->particle = DRW_pass_create(
+ "Particle Pass",
+ DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH |
DRW_STATE_DEPTH_LESS |
+ DRW_STATE_POINT | DRW_STATE_BLEND);
}
{
@@ -1625,19 +1632,22 @@ static void OBJECT_cache_populate_particles(Object *ob,
DRW_shgroup_call_add(shgrp,
geom, mat);
break;
case PART_DRAW_CROSS:
- shgrp =
DRW_shgroup_instance_create(e_data.part_prim_sh, psl->particle,
DRW_cache_particles_get_prim(PART_DRAW_CROSS));
+ shgrp =
DRW_shgroup_instance_create(
+ e_data.part_prim_sh,
psl->particle, DRW_cache_particles_get_prim(PART_DRAW_CROSS));
DRW_shgroup_uniform_texture(shgrp, "ramp", globals_ramp);
DRW_shgroup_uniform_vec3(shgrp,
"color", ma ? &ma->r : def_prim_col, 1);
DRW_shgroup_uniform_int(shgrp,
"screen_space", &screen_space[0], 1);
break;
case PART_DRAW_CIRC:
- shgrp =
DRW_shgroup_instance_create(e_data.part_prim_sh, psl->particle,
DRW_cache_particles_get_prim(PART_DRAW_CIRC));
+ shgrp =
DRW_shgroup_instance_create(
+ e_data.part_prim_sh,
psl->particle, DRW_cache_particles_get_prim(PART_DRAW_CIRC));
DRW_shgroup_uniform_texture(shgrp, "ramp", globals_ramp);
DRW_shgroup_uniform_vec3(shgrp,
"color", ma ? &ma->r : def_prim_col, 1);
DRW_shgroup_uniform_int(shgrp,
"screen_space", &screen_space[1], 1);
break;
case PART_DRAW_AXIS:
- shgrp =
DRW_shgroup_instance_create(e_data.part_axis_sh, psl->particle,
DRW_cache_particles_get_prim(PART_DRAW_AXIS));
+ shgrp =
DRW_shgroup_instance_create(
+ e_data.part_axis_sh,
psl->particle, DRW_cache_particles_get_prim(PART_DRAW_AXIS));
DRW_shgroup_uniform_int(shgrp,
"screen_space", &screen_space[0], 1);
break;
default:
diff --git a/source/blender/draw/modes/paint_vertex_mode.c
b/source/blender/draw/modes/paint_vertex_mode.c
index 3d75068c4f2..68bdf6d1304 100644
--- a/source/blender/draw/modes/paint_vertex_mode.c
+++ b/source/blender/draw/modes/paint_vertex_mode.c
@@ -110,7 +110,9 @@ static void PAINT_VERTEX_cache_init(void *vedata)
{
/* Create a pass */
- psl->vcolor_faces = DRW_pass_create("Vert Color Pass",
DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS);
+ psl->vcolor_faces = DRW_pass_create(
+ "Vert Color Pass",
+ DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH |
DRW_STATE_DEPTH_LESS);
stl->g_data->fvcolor_shgrp =
DRW_shgroup_create(e_data.vcolor_face_shader, psl->vcolor_faces);
@@ -122,13 +124,17 @@ static void PAINT_VERTEX_cache_init(void *vedata)
}
{
- psl->wire_overlay = DRW_pass_create("Wire Pass",
DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS);
+ psl->wire_overlay = DRW_pass_create(
+ "Wire Pass",
+ DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH |
DRW_STATE_DEPTH_LESS);
stl->g_data->lwire_shgrp =
DRW_shgroup_create(e_data.wire_overlay_shader, psl->wire_overlay);
}
{
- psl->face_overlay = DRW_pass_create("Face Mask Pass",
DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS |
DRW_STATE_BLEND);
+ psl->face_overlay = DRW_pass_create(
+ "Face Mask Pass",
+ DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH |
DRW_STATE_DEPTH_LESS | DRW_STATE_BLEND);
stl->g_data->face_shgrp =
DRW_shgroup_create(e_data.face_overlay_shader, psl->face_overlay);
diff --git a/source/blender/draw/modes/pose_mode.c
b/source/blender/draw/modes/pose_mode.c
index d3233d713a1..77688f9156c 100644
--- a/source/blender/draw/modes/pose_mode.c
+++ b/source/blender/draw/modes/pose_mode.c
@@ -101,7 +101,9 @@ static void POSE_cache_init(void *vedata)
{
/* Non Meshes Pass (Camera, empties, lamps ...) */
- DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH
| DRW_STATE_DEPTH_LESS | DRW_STATE_BLEND | DRW_STATE_WIRE;
+ DRWState state =
+ DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH |
DRW_STATE_DEPTH_LESS |
+ DRW_STATE_BLEND | DRW_STATE_WIRE;
psl->relationship = DRW_pass_create("Bone Relationship Pass",
state);
/* Relationship Lines */
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
