diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-07 07:57:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-07 07:57:14 +0300 |
| commit | adfbf276a15346c38cc6b7652191c005b9a3ae9b (patch) | |
| tree | 6f7d27e9adb8c15d3021c8276d6c577a0e5746ba /source/blender/draw/modes/object_mode.c | |
| parent | 37b457221ec77b485b6e65537ac2db7fd8107e6d (diff) | |
Cleanup: style, duplicate includes
Diffstat (limited to 'source/blender/draw/modes/object_mode.c')
| -rw-r--r-- | source/blender/draw/modes/object_mode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index 1ad77c9ac1b..db0ac5a1d11 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -49,7 +49,6 @@ #include "BKE_texture.h" #include "ED_view3d.h" -#include "ED_view3d.h" #include "GPU_shader.h" #include "GPU_texture.h" @@ -119,7 +118,7 @@ typedef struct OBJECT_Data { /* *********** STATIC *********** */ -typedef struct OBJECT_PrivateData{ +typedef struct OBJECT_PrivateData { /* Empties */ DRWShadingGroup *plain_axes; DRWShadingGroup *cube; @@ -487,7 +486,8 @@ static void OBJECT_engine_init(void *vedata) /* Persp : If camera is below floor plane, we switch clipping * Ortho : If eye vector is looking up, we switch clipping */ if (((winmat[3][3] == 0.0f) && (e_data.camera_pos[2] > 0.0f)) || - ((winmat[3][3] != 0.0f) && (zvec[2] < 0.0f))) { + ((winmat[3][3] != 0.0f) && (zvec[2] < 0.0f))) + { e_data.zpos_flag |= CLIP_ZPOS; e_data.zneg_flag |= CLIP_ZNEG; } @@ -1548,7 +1548,7 @@ static void DRW_shgroup_lightprobe(OBJECT_StorageList *stl, OBJECT_PassList *psl } if (prb->type == LIGHTPROBE_TYPE_GRID || - prb->attenuation_type == LIGHTPROBE_SHAPE_BOX) + prb->attenuation_type == LIGHTPROBE_SHAPE_BOX) { DRW_shgroup_call_dynamic_add(stl->g_data->cube, color, &prb->distgridinf, ob->obmat); DRW_shgroup_call_dynamic_add(stl->g_data->cube, color, &prb->distfalloff, ob->obmat); |