Commit: 5cef17a4397391e75264ea5e9c879165fb647a4c
Author: Nick Wu
Date: Wed May 23 23:39:40 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB5cef17a4397391e75264ea5e9c879165fb647a4c
Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr
===================================================================
===================================================================
diff --cc source/blender/draw/CMakeLists.txt
index 373ea06ed10,96dcac5b2d2..6564b2013ad
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -109,12 -112,8 +112,13 @@@ set(SR
engines/workbench/workbench_materials.c
engines/workbench/workbench_studiolight.c
engines/workbench/solid_mode.c
+ engines/workbench/transparent_mode.c
engines/external/external_engine.c
+ #engines/lanpr/NUL_TNS_Kernel.c
+ #engines/lanpr/NUL_Util.c
+ #engines/lanpr/NUL_TNS_SoftwareRender.c
+ engines/lanpr/NUL_TNS_EdgeRendering.c
+ #engines/lanpr/NUL_TNS_Mesh.c
DRW_engine.h
intern/DRW_render.h
@@@ -223,20 -227,8 +235,16 @@@ data_to_c_simple(engines/workbench/shad
data_to_c_simple(engines/workbench/shaders/workbench_shadow_geom.glsl SRC)
data_to_c_simple(engines/workbench/shaders/workbench_shadow_caps_geom.glsl
SRC)
data_to_c_simple(engines/workbench/shaders/workbench_shadow_debug_frag.glsl
SRC)
- data_to_c_simple(engines/workbench/shaders/workbench_background_lib.glsl SRC)
- data_to_c_simple(engines/workbench/shaders/workbench_common_lib.glsl SRC)
- data_to_c_simple(engines/workbench/shaders/workbench_data_lib.glsl SRC)
- data_to_c_simple(engines/workbench/shaders/workbench_object_overlap_lib.glsl
SRC)
data_to_c_simple(engines/workbench/shaders/workbench_world_light_lib.glsl SRC)
+data_to_c_simple(engines/lanpr/shaders/lanpr_atlas_preview.geometry SRC)
+data_to_c_simple(engines/lanpr/shaders/lanpr_atlas_project_clip.fragment SRC)
+data_to_c_simple(engines/lanpr/shaders/lanpr_atlas_project_passthrough.vertex
SRC)
+data_to_c_simple(engines/lanpr/shaders/lanpr_image_peel.fragment SRC)
+data_to_c_simple(engines/lanpr/shaders/lanpr_line_connection.geometry SRC)
+data_to_c_simple(engines/lanpr/shaders/lanpr_snake_edge.fragment SRC)
+data_to_c_simple(engines/lanpr/shaders/lanpr_snake_multichannel.fragment SRC)
+
data_to_c_simple(modes/shaders/common_globals_lib.glsl SRC)
data_to_c_simple(modes/shaders/common_view_lib.glsl SRC)
data_to_c_simple(modes/shaders/common_fxaa_lib.glsl SRC)
diff --cc source/blender/draw/intern/draw_manager.c
index a77cbac9008,29adb6b47f4..c4f6da5ba83
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@@ -2022,8 -2026,9 +2027,9 @@@ void DRW_engines_register(void
#endif
RE_engines_register(&DRW_engine_viewport_eevee_type);
RE_engines_register(&DRW_engine_viewport_workbench_type);
-
+ RE_engines_register(&DRW_engine_viewport_lanpr_type);
DRW_engine_register(&draw_engine_workbench_solid);
+ DRW_engine_register(&draw_engine_workbench_transparent);
DRW_engine_register(&draw_engine_object_type);
DRW_engine_register(&draw_engine_edit_armature_type);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
