diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2020-03-09 18:27:24 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2020-03-09 18:27:24 +0300 |
commit | 29f3af95272590d26f610ae828b2eeee89c82a00 (patch) | |
tree | a696a58a2561c48f7ec6166e369e22081e0a64d8 /source/blender/draw/CMakeLists.txt | |
parent | dcb93126876879d969a30a7865700abd072066f8 (diff) |
GPencil: Refactor of Draw Engine, Vertex Paint and all internal functions
This commit is a full refactor of the grease pencil modules including Draw Engine, Modifiers, VFX, depsgraph update, improvements in operators and conversion of Sculpt and Weight paint tools to real brushes.
Also, a huge code cleanup has been done at all levels.
Thanks to @fclem for his work and yo @pepeland and @mendio for the testing and help in the development.
Differential Revision: https://developer.blender.org/D6293
Diffstat (limited to 'source/blender/draw/CMakeLists.txt')
-rw-r--r-- | source/blender/draw/CMakeLists.txt | 50 |
1 files changed, 18 insertions, 32 deletions
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index 6d7b422c4fb..1f04739644e 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -52,6 +52,7 @@ set(SRC intern/draw_cache_extract_mesh.c intern/draw_cache_impl_curve.c intern/draw_cache_impl_displist.c + intern/draw_cache_impl_gpencil.c intern/draw_cache_impl_lattice.c intern/draw_cache_impl_mesh.c intern/draw_cache_impl_metaball.c @@ -111,12 +112,13 @@ set(SRC engines/workbench/workbench_studiolight.c engines/workbench/workbench_volume.c engines/external/external_engine.c + engines/gpencil/gpencil_antialiasing.c engines/gpencil/gpencil_cache_utils.c - engines/gpencil/gpencil_draw_cache_impl.c - engines/gpencil/gpencil_draw_utils.c + engines/gpencil/gpencil_draw_data.c engines/gpencil/gpencil_engine.c engines/gpencil/gpencil_engine.h engines/gpencil/gpencil_render.c + engines/gpencil/gpencil_shader.c engines/gpencil/gpencil_shader_fx.c engines/select/select_draw_utils.c engines/select/select_engine.c @@ -129,6 +131,7 @@ set(SRC engines/overlay/overlay_engine.c engines/overlay/overlay_extra.c engines/overlay/overlay_facing.c + engines/overlay/overlay_gpencil.c engines/overlay/overlay_grid.c engines/overlay/overlay_image.c engines/overlay/overlay_lattice.c @@ -277,36 +280,16 @@ data_to_c_simple(intern/shaders/common_fxaa_lib.glsl SRC) data_to_c_simple(intern/shaders/common_smaa_lib.glsl SRC) data_to_c_simple(intern/shaders/common_fullscreen_vert.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/gpencil_fill_vert.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/gpencil_fill_frag.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/gpencil_stroke_vert.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/gpencil_stroke_geom.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/gpencil_stroke_frag.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/gpencil_zdepth_mix_frag.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/gpencil_simple_mix_frag.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/gpencil_blend_frag.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/gpencil_point_vert.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/gpencil_point_geom.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/gpencil_point_frag.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/gpencil_background_frag.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/gpencil_paper_frag.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/gpencil_edit_point_vert.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/gpencil_edit_point_geom.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/gpencil_edit_point_frag.glsl SRC) - -data_to_c_simple(engines/gpencil/shaders/fx/gpencil_fx_blur_frag.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/fx/gpencil_fx_colorize_frag.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/fx/gpencil_fx_flip_frag.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/fx/gpencil_fx_glow_prepare_frag.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/fx/gpencil_fx_glow_resolve_frag.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/fx/gpencil_fx_light_frag.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/fx/gpencil_fx_pixel_frag.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/fx/gpencil_fx_rim_prepare_frag.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/fx/gpencil_fx_rim_resolve_frag.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/fx/gpencil_fx_shadow_prepare_frag.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/fx/gpencil_fx_shadow_resolve_frag.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/fx/gpencil_fx_swirl_frag.glsl SRC) -data_to_c_simple(engines/gpencil/shaders/fx/gpencil_fx_wave_frag.glsl SRC) +data_to_c_simple(engines/gpencil/shaders/gpencil_frag.glsl SRC) +data_to_c_simple(engines/gpencil/shaders/gpencil_vert.glsl SRC) +data_to_c_simple(engines/gpencil/shaders/gpencil_antialiasing_frag.glsl SRC) +data_to_c_simple(engines/gpencil/shaders/gpencil_antialiasing_vert.glsl SRC) +data_to_c_simple(engines/gpencil/shaders/gpencil_common_lib.glsl SRC) +data_to_c_simple(engines/gpencil/shaders/gpencil_layer_blend_frag.glsl SRC) +data_to_c_simple(engines/gpencil/shaders/gpencil_mask_invert_frag.glsl SRC) +data_to_c_simple(engines/gpencil/shaders/gpencil_depth_merge_frag.glsl SRC) +data_to_c_simple(engines/gpencil/shaders/gpencil_depth_merge_vert.glsl SRC) +data_to_c_simple(engines/gpencil/shaders/gpencil_vfx_frag.glsl SRC) data_to_c_simple(engines/select/shaders/selection_id_3D_vert.glsl SRC) data_to_c_simple(engines/select/shaders/selection_id_frag.glsl SRC) @@ -340,6 +323,9 @@ data_to_c_simple(engines/overlay/shaders/edit_curve_handle_geom.glsl SRC) data_to_c_simple(engines/overlay/shaders/edit_curve_handle_vert.glsl SRC) data_to_c_simple(engines/overlay/shaders/edit_curve_point_vert.glsl SRC) data_to_c_simple(engines/overlay/shaders/edit_curve_wire_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/edit_gpencil_canvas_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/edit_gpencil_guide_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/edit_gpencil_vert.glsl SRC) data_to_c_simple(engines/overlay/shaders/edit_lattice_point_vert.glsl SRC) data_to_c_simple(engines/overlay/shaders/edit_lattice_wire_vert.glsl SRC) data_to_c_simple(engines/overlay/shaders/edit_mesh_common_lib.glsl SRC) |