[Bf-blender-cvs] [c8aad8defa3] greasepencil-refactor: GPencil: Cleanup - remove more ToDo and unused code
Antonio Vazquez
noreply at git.blender.org
Wed Jan 8 16:56:59 CET 2020
Commit: c8aad8defa3074d7727b0e97b8bc0ed107f770a9
Author: Antonio Vazquez
Date: Wed Jan 8 16:56:53 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rBc8aad8defa3074d7727b0e97b8bc0ed107f770a9
GPencil: Cleanup - remove more ToDo and unused code
===================================================================
M release/scripts/startup/bl_ui/properties_data_gpencil.py
M source/blender/draw/engines/overlay/overlay_gpencil.c
M source/blender/draw/engines/overlay/overlay_outline.c
M source/blender/draw/intern/draw_cache_impl_gpencil.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_data_gpencil.py b/release/scripts/startup/bl_ui/properties_data_gpencil.py
index 684909b8d03..874c4213c02 100644
--- a/release/scripts/startup/bl_ui/properties_data_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_data_gpencil.py
@@ -384,8 +384,6 @@ class DATA_PT_gpencil_display(DataButtonsPanel, Panel):
gpl = gpd.layers.active
layout.prop(gpd, "edit_line_color", text="Edit Line Color")
- if gpl:
- layout.prop(gpd, "show_stroke_direction", text="Show Stroke Directions")
class DATA_PT_gpencil_canvas(DataButtonsPanel, Panel):
diff --git a/source/blender/draw/engines/overlay/overlay_gpencil.c b/source/blender/draw/engines/overlay/overlay_gpencil.c
index a43d69741cb..d5bd2624a06 100644
--- a/source/blender/draw/engines/overlay/overlay_gpencil.c
+++ b/source/blender/draw/engines/overlay/overlay_gpencil.c
@@ -49,11 +49,6 @@ void OVERLAY_edit_gpencil_cache_init(OVERLAY_Data *vedata)
pd->edit_gpencil_wires_grp = NULL;
psl->edit_gpencil_ps = NULL;
- /* REFACTOR(fclem) remove */
- if (G.debug_value != 50) {
- return;
- }
-
const DRWContextState *draw_ctx = DRW_context_state_get();
View3D *v3d = draw_ctx->v3d;
Object *ob = draw_ctx->obact;
@@ -144,11 +139,6 @@ void OVERLAY_gpencil_cache_init(OVERLAY_Data *vedata)
/* Default: Display nothing. */
psl->gpencil_canvas_ps = NULL;
- /* REFACTOR(fclem) remove */
- if (G.debug_value != 50) {
- return;
- }
-
const DRWContextState *draw_ctx = DRW_context_state_get();
View3D *v3d = draw_ctx->v3d;
Object *ob = draw_ctx->obact;
diff --git a/source/blender/draw/engines/overlay/overlay_outline.c b/source/blender/draw/engines/overlay/overlay_outline.c
index 458a4f8b4c7..895ef8f5c24 100644
--- a/source/blender/draw/engines/overlay/overlay_outline.c
+++ b/source/blender/draw/engines/overlay/overlay_outline.c
@@ -237,10 +237,6 @@ static void gp_stroke_cache_populate(bGPDlayer *UNUSED(gpl),
static void OVERLAY_outline_gpencil(OVERLAY_PrivateData *pd, Object *ob)
{
- /* REFACTOR(fclem) remove */
- if (G.debug_value != 50) {
- return;
- }
/* No outlines in edit mode. */
bGPdata *gpd = (bGPdata *)ob->data;
if (gpd && GPENCIL_ANY_MODE(gpd)) {
diff --git a/source/blender/draw/intern/draw_cache_impl_gpencil.c b/source/blender/draw/intern/draw_cache_impl_gpencil.c
index 58cc7c01d2c..d1927f23328 100644
--- a/source/blender/draw/intern/draw_cache_impl_gpencil.c
+++ b/source/blender/draw/intern/draw_cache_impl_gpencil.c
@@ -42,25 +42,6 @@
#include "draw_cache_impl.h"
/* ---------------------------------------------------------------------- */
-/* GPencil GPUBatch Cache */
-
-/* REFACTOR Cleanup after */
-typedef struct GpencilBatchCacheElem {
- GPUBatch *batch;
- GPUVertBuf *vbo;
- int vbo_len;
- /* attr ids */
- GPUVertFormat *format;
- uint pos_id;
- uint color_id;
- uint thickness_id;
- uint uvdata_id;
- uint prev_pos_id;
-
- /* size for VBO alloc */
- int tot_vertex;
-} GpencilBatchCacheElem;
-
typedef struct GpencilBatchCache {
/** Instancing Data */
GPUVertBuf *vbo;
More information about the Bf-blender-cvs
mailing list