Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-06-14 23:44:53 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-06-14 23:44:53 +0300
commit51f1ed8221042f2e273f5ee47a6053f506a783fc (patch)
tree1f8462a771da1a3ecddf5be04c05626d96239ce0 /source/blender/draw
parent928d31d94a49f0b2644e7345ac58264c75db94f7 (diff)
Cleanup: style
Diffstat (limited to 'source/blender/draw')
-rw-r--r--source/blender/draw/engines/workbench/workbench_forward.c7
-rw-r--r--source/blender/draw/modes/edit_mesh_mode.c30
2 files changed, 13 insertions, 24 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_forward.c b/source/blender/draw/engines/workbench/workbench_forward.c
index 3912494d9db..bbb43f3655e 100644
--- a/source/blender/draw/engines/workbench/workbench_forward.c
+++ b/source/blender/draw/engines/workbench/workbench_forward.c
@@ -476,7 +476,7 @@ void workbench_forward_cache_populate(WORKBENCH_Data *vedata, Object *ob)
struct Gwn_Batch **geom_array = me->totcol ? DRW_cache_mesh_surface_texpaint_get(ob) : NULL;
if (materials_len > 0 && geom_array) {
for (int i = 0; i < materials_len; i++) {
- if(geom_array[i] == NULL) {
+ if (geom_array[i] == NULL) {
continue;
}
@@ -524,14 +524,13 @@ void workbench_forward_cache_populate(WORKBENCH_Data *vedata, Object *ob)
ob, gpumat_array, materials_len, NULL, NULL, NULL);
if (mat_geom) {
for (int i = 0; i < materials_len; ++i) {
- if(mat_geom[i] == NULL) {
+ if (mat_geom[i] == NULL) {
continue;
}
Material *mat = give_current_material(ob, i + 1);
material = get_or_create_material_data(vedata, ob, mat, NULL, OB_SOLID);
- if (is_sculpt_mode)
- {
+ if (is_sculpt_mode) {
DRW_shgroup_call_sculpt_add(material->shgrp_object_outline, ob, ob->obmat);
DRW_shgroup_call_sculpt_add(material->shgrp, ob, ob->obmat);
}
diff --git a/source/blender/draw/modes/edit_mesh_mode.c b/source/blender/draw/modes/edit_mesh_mode.c
index d51f3a85105..94eeb58dcb2 100644
--- a/source/blender/draw/modes/edit_mesh_mode.c
+++ b/source/blender/draw/modes/edit_mesh_mode.c
@@ -139,8 +139,7 @@ typedef struct EDIT_MESH_PrivateData {
static int EDIT_MESH_sh_index(ToolSettings *tsettings, RegionView3D *rv3d, bool supports_fast_mode)
{
int result = tsettings->selectmode << 1;
- if (supports_fast_mode)
- {
+ if (supports_fast_mode) {
SET_FLAG_FROM_TEST(result, (rv3d->rflag & RV3D_NAVIGATING), 1 << 0);
}
return result;
@@ -154,28 +153,23 @@ static char *EDIT_MESH_sh_defines(ToolSettings *tsettings, RegionView3D *rv3d, b
char *str = NULL;
DynStr *ds = BLI_dynstr_new();
- if (selectmode & SCE_SELECT_VERTEX)
- {
+ if (selectmode & SCE_SELECT_VERTEX) {
BLI_dynstr_append(ds, "#define VERTEX_SELECTION\n");
}
- if (selectmode & SCE_SELECT_EDGE)
- {
+ if (selectmode & SCE_SELECT_EDGE) {
BLI_dynstr_append(ds, "#define EDGE_SELECTION\n");
}
- if (selectmode & SCE_SELECT_FACE)
- {
+ if (selectmode & SCE_SELECT_FACE) {
BLI_dynstr_append(ds, "#define FACE_SELECTION\n");
}
- if (!fast_mode)
- {
+ if (!fast_mode) {
BLI_dynstr_append(ds, "#define EDGE_FIX\n");
}
- if (anti_alias)
- {
+ if (anti_alias) {
BLI_dynstr_append(ds, "#define ANTI_ALIASING\n");
}
BLI_dynstr_append(ds, "#define VERTEX_FACING\n");
@@ -188,10 +182,8 @@ static char *EDIT_MESH_sh_defines(ToolSettings *tsettings, RegionView3D *rv3d, b
static GPUShader *EDIT_MESH_ensure_shader(ToolSettings *tsettings, RegionView3D *rv3d, bool fast_mode, bool looseedge)
{
const int index = EDIT_MESH_sh_index(tsettings, rv3d, fast_mode);
- if (looseedge)
- {
- if (!e_data.overlay_loose_edge_sh_cache[index])
- {
+ if (looseedge) {
+ if (!e_data.overlay_loose_edge_sh_cache[index]) {
char *defines = EDIT_MESH_sh_defines(tsettings, rv3d, true);
e_data.overlay_loose_edge_sh_cache[index] = DRW_shader_create_with_lib(
datatoc_edit_mesh_overlay_vert_glsl,
@@ -204,8 +196,7 @@ static GPUShader *EDIT_MESH_ensure_shader(ToolSettings *tsettings, RegionView3D
return e_data.overlay_loose_edge_sh_cache[index];
}
else {
- if (!e_data.overlay_tri_sh_cache[index])
- {
+ if (!e_data.overlay_tri_sh_cache[index]) {
char *defines = EDIT_MESH_sh_defines(tsettings, rv3d, true);
e_data.overlay_tri_sh_cache[index] = DRW_shader_create_with_lib(
datatoc_edit_mesh_overlay_vert_glsl,
@@ -578,8 +569,7 @@ static void EDIT_MESH_engine_free(void)
DRW_SHADER_FREE_SAFE(e_data.normals_face_sh);
DRW_SHADER_FREE_SAFE(e_data.normals_sh);
- for (int i = 0; i < MAX_SHADERS; i++)
- {
+ for (int i = 0; i < MAX_SHADERS; i++) {
DRW_SHADER_FREE_SAFE(e_data.overlay_tri_sh_cache[i]);
DRW_SHADER_FREE_SAFE(e_data.overlay_loose_edge_sh_cache[i]);
}