[Bf-blender-cvs] [6df67f026cd] soc-2019-npr: LANPR: Remove edge detection mode file from compiling.
YimingWu
noreply at git.blender.org
Thu Aug 1 10:24:27 CEST 2019
Commit: 6df67f026cdfe32cc7f9556fc2e9978f4b5fc51a
Author: YimingWu
Date: Thu Aug 1 16:23:48 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB6df67f026cdfe32cc7f9556fc2e9978f4b5fc51a
LANPR: Remove edge detection mode file from compiling.
===================================================================
M source/blender/draw/CMakeLists.txt
M source/blender/draw/engines/lanpr/lanpr_engine.c
===================================================================
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index 6e508684210..1c325723963 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -128,7 +128,7 @@ set(SRC
engines/gpencil/gpencil_shader_fx.c
engines/lanpr/lanpr_dpix.c
engines/lanpr/lanpr_engine.c
- engines/lanpr/lanpr_snake.c
+ # engines/lanpr/lanpr_snake.c deprecated for now.
engines/lanpr/lanpr_cpu.c
engines/lanpr/lanpr_chain_draw.c
engines/select/select_engine.c
diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c
index c4ce65f87c2..ab410c14d7b 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -559,10 +559,12 @@ static void lanpr_draw_scene_exec(void *vedata, GPUFrameBuffer *dfb, int is_rend
DRW_draw_pass(psl->color_pass);
lanpr_dpix_draw_scene(txl, fbl, psl, stl->g_data, lanpr, dfb, is_render);
}
+ /* Deprecated
else if (lanpr->master_mode == LANPR_MASTER_MODE_SNAKE) {
DRW_draw_pass(psl->color_pass);
lanpr_snake_draw_scene(txl, fbl, psl, stl->g_data, lanpr, dfb, is_render);
}
+ */
else if (lanpr->master_mode == LANPR_MASTER_MODE_SOFTWARE) {
/* should isolate these into a seperate function. */
lanpr_software_draw_scene(vedata, dfb, is_render);
More information about the Bf-blender-cvs
mailing list