diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-10-11 01:08:30 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-11 01:08:30 +0300 |
commit | 66738d4aa017203caff067c41e25e28d62c3fd0b (patch) | |
tree | dee20ce0b0b6293812eeb76be279d9103297d60b /source/blender/draw | |
parent | 95f2604ea7b32d034cce7c7ec46149eaf6174d47 (diff) | |
parent | 2083a7e274fefd4c82c8c52df87bc175e453c628 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/draw')
-rw-r--r-- | source/blender/draw/intern/draw_manager.c | 2 | ||||
-rw-r--r-- | source/blender/draw/modes/overlay_mode.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 38fc7739f6a..512100d3ded 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -1281,7 +1281,7 @@ static void drw_engines_enable(ViewLayer *view_layer, RenderEngineType *engine_t { Object *obact = OBACT(view_layer); const int mode = CTX_data_mode_enum_ex(DST.draw_ctx.object_edit, obact, DST.draw_ctx.object_mode); - View3D * v3d = DST.draw_ctx.v3d; + View3D *v3d = DST.draw_ctx.v3d; const int drawtype = v3d->shading.type; const bool use_xray = XRAY_ENABLED(v3d); diff --git a/source/blender/draw/modes/overlay_mode.c b/source/blender/draw/modes/overlay_mode.c index 166b2a12d7b..3fa2f1d48e2 100644 --- a/source/blender/draw/modes/overlay_mode.c +++ b/source/blender/draw/modes/overlay_mode.c @@ -88,7 +88,7 @@ extern struct GlobalsUboStorage ts; /* draw_common.c */ /* Functions */ static void overlay_engine_init(void *vedata) { - OVERLAY_Data * data = (OVERLAY_Data *)vedata; + OVERLAY_Data *data = vedata; OVERLAY_StorageList *stl = data->stl; if (!stl->g_data) { @@ -149,7 +149,7 @@ static void overlay_engine_init(void *vedata) static void overlay_cache_init(void *vedata) { - OVERLAY_Data * data = (OVERLAY_Data *)vedata; + OVERLAY_Data *data = vedata; OVERLAY_PassList *psl = data->psl; OVERLAY_StorageList *stl = data->stl; @@ -223,7 +223,7 @@ static void overlay_cache_init(void *vedata) static void overlay_cache_populate(void *vedata, Object *ob) { - OVERLAY_Data * data = (OVERLAY_Data *)vedata; + OVERLAY_Data *data = vedata; OVERLAY_StorageList *stl = data->stl; OVERLAY_PrivateData *pd = stl->g_data; OVERLAY_PassList *psl = data->psl; @@ -322,7 +322,7 @@ static void overlay_cache_populate(void *vedata, Object *ob) static void overlay_cache_finish(void *vedata) { - OVERLAY_Data * data = (OVERLAY_Data *)vedata; + OVERLAY_Data *data = vedata; OVERLAY_PassList *psl = data->psl; OVERLAY_StorageList *stl = data->stl; @@ -340,7 +340,7 @@ static void overlay_cache_finish(void *vedata) static void overlay_draw_scene(void *vedata) { - OVERLAY_Data * data = (OVERLAY_Data *)vedata; + OVERLAY_Data *data = vedata; OVERLAY_PassList *psl = data->psl; DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get(); |