[Bf-blender-cvs] [ae3687ac480] tmp-overlay-engine: Cleanup: DRW: Remove old unused code
Clément Foucault
noreply at git.blender.org
Wed Nov 20 20:54:20 CET 2019
Commit: ae3687ac480d8de8714b063b67dbb7b9eec9ccc9
Author: Clément Foucault
Date: Wed Nov 20 02:01:30 2019 +0100
Branches: tmp-overlay-engine
https://developer.blender.org/rBae3687ac480d8de8714b063b67dbb7b9eec9ccc9
Cleanup: DRW: Remove old unused code
===================================================================
M source/blender/draw/CMakeLists.txt
M source/blender/draw/engines/gpencil/gpencil_engine.c
M source/blender/draw/engines/gpencil/gpencil_engine.h
M source/blender/draw/engines/gpencil/gpencil_render.c
M source/blender/draw/engines/overlay/overlay_armature.c
M source/blender/draw/engines/overlay/overlay_engine.c
M source/blender/draw/engines/overlay/overlay_motion_path.c
M source/blender/draw/engines/overlay/overlay_particle.c
M source/blender/draw/engines/overlay/overlay_private.h
M source/blender/draw/intern/draw_cache.c
M source/blender/draw/intern/draw_cache.h
M source/blender/draw/intern/draw_common.c
M source/blender/draw/intern/draw_common.h
M source/blender/draw/intern/draw_manager.c
R100 source/blender/draw/modes/shaders/common_colormanagement_lib.glsl source/blender/draw/intern/shaders/common_colormanagement_lib.glsl
R100 source/blender/draw/modes/shaders/common_fullscreen_vert.glsl source/blender/draw/intern/shaders/common_fullscreen_vert.glsl
R100 source/blender/draw/modes/shaders/common_fxaa_lib.glsl source/blender/draw/intern/shaders/common_fxaa_lib.glsl
R100 source/blender/draw/modes/shaders/common_globals_lib.glsl source/blender/draw/intern/shaders/common_globals_lib.glsl
R100 source/blender/draw/modes/shaders/common_hair_lib.glsl source/blender/draw/intern/shaders/common_hair_lib.glsl
R100 source/blender/draw/modes/shaders/common_hair_refine_vert.glsl source/blender/draw/intern/shaders/common_hair_refine_vert.glsl
R100 source/blender/draw/modes/shaders/common_view_lib.glsl source/blender/draw/intern/shaders/common_view_lib.glsl
D source/blender/draw/modes/draw_mode_engines.h
D source/blender/draw/modes/edit_armature_mode.c
D source/blender/draw/modes/edit_curve_mode.c
D source/blender/draw/modes/edit_lattice_mode.c
D source/blender/draw/modes/edit_mesh_mode.c
D source/blender/draw/modes/edit_mesh_mode_intern.h
D source/blender/draw/modes/edit_mesh_mode_text.c
D source/blender/draw/modes/edit_metaball_mode.c
D source/blender/draw/modes/edit_text_mode.c
D source/blender/draw/modes/object_mode.c
D source/blender/draw/modes/overlay_mode.c
D source/blender/draw/modes/paint_texture_mode.c
D source/blender/draw/modes/paint_vertex_mode.c
D source/blender/draw/modes/particle_mode.c
D source/blender/draw/modes/pose_mode.c
D source/blender/draw/modes/sculpt_mode.c
D source/blender/draw/modes/shaders/animviz_mpath_lines_geom.glsl
D source/blender/draw/modes/shaders/animviz_mpath_lines_vert.glsl
D source/blender/draw/modes/shaders/animviz_mpath_points_vert.glsl
D source/blender/draw/modes/shaders/armature_axes_vert.glsl
D source/blender/draw/modes/shaders/armature_dof_vert.glsl
D source/blender/draw/modes/shaders/armature_envelope_distance_frag.glsl
D source/blender/draw/modes/shaders/armature_envelope_outline_vert.glsl
D source/blender/draw/modes/shaders/armature_envelope_solid_frag.glsl
D source/blender/draw/modes/shaders/armature_envelope_solid_vert.glsl
D source/blender/draw/modes/shaders/armature_shape_outline_geom.glsl
D source/blender/draw/modes/shaders/armature_shape_outline_vert.glsl
D source/blender/draw/modes/shaders/armature_shape_solid_frag.glsl
D source/blender/draw/modes/shaders/armature_shape_solid_vert.glsl
D source/blender/draw/modes/shaders/armature_sphere_outline_vert.glsl
D source/blender/draw/modes/shaders/armature_sphere_solid_frag.glsl
D source/blender/draw/modes/shaders/armature_sphere_solid_vert.glsl
D source/blender/draw/modes/shaders/armature_stick_frag.glsl
D source/blender/draw/modes/shaders/armature_stick_vert.glsl
D source/blender/draw/modes/shaders/edit_curve_overlay_handle_geom.glsl
D source/blender/draw/modes/shaders/edit_curve_overlay_handle_vert.glsl
D source/blender/draw/modes/shaders/edit_curve_overlay_loosevert_vert.glsl
D source/blender/draw/modes/shaders/edit_curve_overlay_normals_vert.glsl
D source/blender/draw/modes/shaders/edit_lattice_overlay_frag.glsl
D source/blender/draw/modes/shaders/edit_lattice_overlay_loosevert_vert.glsl
D source/blender/draw/modes/shaders/edit_mesh_overlay_common_lib.glsl
D source/blender/draw/modes/shaders/edit_mesh_overlay_facefill_frag.glsl
D source/blender/draw/modes/shaders/edit_mesh_overlay_facefill_vert.glsl
D source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl
D source/blender/draw/modes/shaders/edit_mesh_overlay_geom.glsl
D source/blender/draw/modes/shaders/edit_mesh_overlay_ghost_clear_vert.glsl
D source/blender/draw/modes/shaders/edit_mesh_overlay_mesh_analysis_frag.glsl
D source/blender/draw/modes/shaders/edit_mesh_overlay_mesh_analysis_vert.glsl
D source/blender/draw/modes/shaders/edit_mesh_overlay_mix_frag.glsl
D source/blender/draw/modes/shaders/edit_mesh_overlay_vert.glsl
D source/blender/draw/modes/shaders/edit_mesh_skin_root_vert.glsl
D source/blender/draw/modes/shaders/edit_normals_geom.glsl
D source/blender/draw/modes/shaders/edit_normals_vert.glsl
D source/blender/draw/modes/shaders/object_camera_image_frag.glsl
D source/blender/draw/modes/shaders/object_camera_image_vert.glsl
D source/blender/draw/modes/shaders/object_color_axes_vert.glsl
D source/blender/draw/modes/shaders/object_empty_axes_vert.glsl
D source/blender/draw/modes/shaders/object_empty_image_frag.glsl
D source/blender/draw/modes/shaders/object_empty_image_vert.glsl
D source/blender/draw/modes/shaders/object_grid_frag.glsl
D source/blender/draw/modes/shaders/object_grid_vert.glsl
D source/blender/draw/modes/shaders/object_lightprobe_grid_vert.glsl
D source/blender/draw/modes/shaders/object_loose_points_frag.glsl
D source/blender/draw/modes/shaders/object_mball_handles_vert.glsl
D source/blender/draw/modes/shaders/object_outline_detect_frag.glsl
D source/blender/draw/modes/shaders/object_outline_expand_frag.glsl
D source/blender/draw/modes/shaders/object_outline_prepass_frag.glsl
D source/blender/draw/modes/shaders/object_outline_prepass_geom.glsl
D source/blender/draw/modes/shaders/object_outline_prepass_vert.glsl
D source/blender/draw/modes/shaders/object_outline_resolve_frag.glsl
D source/blender/draw/modes/shaders/object_particle_dot_frag.glsl
D source/blender/draw/modes/shaders/object_particle_dot_vert.glsl
D source/blender/draw/modes/shaders/object_particle_prim_vert.glsl
D source/blender/draw/modes/shaders/paint_face_selection_vert.glsl
D source/blender/draw/modes/shaders/paint_face_vert.glsl
D source/blender/draw/modes/shaders/paint_texture_frag.glsl
D source/blender/draw/modes/shaders/paint_texture_vert.glsl
D source/blender/draw/modes/shaders/paint_vert_frag.glsl
D source/blender/draw/modes/shaders/paint_vertex_frag.glsl
D source/blender/draw/modes/shaders/paint_vertex_vert.glsl
D source/blender/draw/modes/shaders/paint_weight_frag.glsl
D source/blender/draw/modes/shaders/paint_weight_vert.glsl
D source/blender/draw/modes/shaders/paint_wire_frag.glsl
D source/blender/draw/modes/shaders/paint_wire_vert.glsl
D source/blender/draw/modes/shaders/particle_strand_frag.glsl
D source/blender/draw/modes/shaders/particle_strand_vert.glsl
D source/blender/draw/modes/shaders/pose_selection_vert.glsl
D source/blender/draw/modes/shaders/sculpt_mask_vert.glsl
D source/blender/draw/modes/shaders/volume_velocity_vert.glsl
===================================================================
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index bf11fe2ce2e..704d51af777 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -21,7 +21,6 @@
set(INC
.
intern
- modes
../blenfont
../blenkernel
@@ -49,8 +48,6 @@ set(INC_SYS
)
set(SRC
- intern/draw_anim_viz.c
- intern/draw_armature.c
intern/draw_cache.c
intern/draw_cache_extract_mesh.c
intern/draw_cache_impl_curve.c
@@ -72,19 +69,6 @@ set(SRC
intern/draw_manager_texture.c
intern/draw_select_buffer.c
intern/draw_view.c
- modes/edit_armature_mode.c
- modes/edit_curve_mode.c
- modes/edit_lattice_mode.c
- modes/edit_mesh_mode.c
- modes/edit_mesh_mode_text.c
- modes/edit_metaball_mode.c
- modes/edit_text_mode.c
- modes/object_mode.c
- modes/paint_texture_mode.c
- modes/paint_vertex_mode.c
- modes/particle_mode.c
- modes/pose_mode.c
- modes/sculpt_mode.c
engines/basic/basic_engine.c
engines/eevee/eevee_bloom.c
engines/eevee/eevee_data.c
@@ -168,8 +152,6 @@ set(SRC
intern/draw_manager_profiling.h
intern/draw_manager_text.h
intern/draw_view.h
- modes/draw_mode_engines.h
- modes/edit_mesh_mode_intern.h
engines/basic/basic_engine.h
engines/eevee/eevee_engine.h
engines/eevee/eevee_lightcache.h
@@ -278,65 +260,13 @@ data_to_c_simple(engines/workbench/shaders/workbench_volume_vert.glsl SRC)
data_to_c_simple(engines/workbench/shaders/workbench_volume_frag.glsl SRC)
data_to_c_simple(engines/workbench/shaders/workbench_world_light_lib.glsl SRC)
-data_to_c_simple(modes/shaders/common_colormanagement_lib.glsl SRC)
-data_to_c_simple(modes/shaders/common_globals_lib.glsl SRC)
-data_to_c_simple(modes/shaders/common_hair_lib.glsl SRC)
-data_to_c_simple(modes/shaders/common_hair_refine_vert.glsl SRC)
-data_to_c_simple(modes/shaders/common_view_lib.glsl SRC)
-data_to_c_simple(modes/shaders/common_fxaa_lib.glsl SRC)
-data_to_c_simple(modes/shaders/common_fullscreen_vert.glsl SRC)
-data_to_c_simple(modes/shaders/animviz_mpath_lines_vert.glsl SRC)
-data_to_c_simple(modes/shaders/animviz_mpath_lines_geom.glsl SRC)
-data_to_c_simple(modes/shaders/animviz_mpath_points_vert.glsl SRC)
-data_to_c_simple(modes/shaders/armature_axes_vert.glsl SRC)
-data_to_c_simple(modes/shaders/armature_envelope_distance_frag.glsl SRC)
-data_to_c_simple(modes/shaders/edit_mesh_overlay_common_lib.glsl SRC)
-data_to_c_simple(modes/shaders/edit_mesh_overlay_frag.glsl SRC)
-data_to_c_simple(modes/shaders/edit_mesh_overlay_vert.glsl SRC)
-data_to_c_simple(modes/shaders/edit_mesh_overlay_geom.glsl SRC)
-data_to_c_simple(modes/shaders/edit_mesh_overlay_mix_frag.glsl SRC)
-data_to_c_simple(modes/shaders/edit_mesh_overlay_facefill_vert.glsl SRC)
-data_to_c_simple(modes/shaders/edit_mesh_overlay_facefill_frag.glsl SRC)
-data_to_c_simple(modes/shaders/edit_mesh_overlay_mesh_analysis_frag.glsl SRC)
-data_to_c_simple(modes/shaders/edit_mesh_overlay_mesh_analysis_vert.glsl SRC)
-data_to_c_simple(modes/shaders/edit_mesh_skin_root_vert.glsl SRC)
-data_to_c_simple(modes/shaders/edit_curve_overlay_handle_vert.glsl SRC)
-data_to_c_simple(modes/shaders/edit_curve_overlay_handle_geom.glsl SRC)
-data_to_c_simple(modes/shaders/edit_curve_overlay_loosevert_vert.glsl SRC)
-data_to_c_simple(modes/shaders/edit_curve_overlay_normals_vert.glsl SRC)
-data_to_c_simple(modes/shaders/edit_lattice_overlay_frag.glsl SRC)
-data_to_c_simple(modes/shaders/edit_lattice_overlay_loosevert_vert.glsl SRC)
-data_to_c_simple(modes/shaders/edit_normals_vert.glsl SRC)
-data_to_c_simple(modes/shaders/edit_normals_geom.glsl SRC)
-data_to_c_simple(modes/shaders/object_camera_image_frag.glsl SRC)
-data_to_c_simple(modes/shaders/object_camera_image_vert.glsl SRC)
-data_to_c_simple(modes/shaders/object_color_axes_vert.glsl SRC)
-data_to_c_simple(modes/shaders/object_empty_axes_vert.glsl SRC)
-data_to_c_simple(modes/shaders/object_empty_image_frag.glsl SRC)
-data_to_c_simple(modes/shaders/object_empty_image_vert.glsl SRC)
-data_to_c_simple(modes/shaders/object_outline_resolve_frag.glsl SRC)
-data_to_c_simple(modes/shaders/object_outline_expand_frag.glsl SRC)
-data_to_c_simple(modes/shaders/object_outline_detect_frag.glsl SRC)
-data_to_c_simple(modes/shaders/object_outline_prepass_vert.glsl SRC)
-data_to_c_simple(modes/shaders/object_outline_prepass_geom.glsl SRC)
-data_to_c_simple(modes/shaders/object_outline_prepass_frag.glsl SRC)
-data_to_c_simple(modes/shaders/object_grid_frag.glsl SRC)
-data_to_c_simple(modes/shaders/object_grid_vert.glsl SRC)
-data_to_c_simple(modes/shaders/object_lightprobe_grid_vert.glsl SRC)
-data_to_c_simple(modes/shaders/object_mball_handles_vert.glsl SRC)
-data_to_c_simple(modes/shaders/object_particle_prim_vert.glsl SRC)
-data_to_c_simple(modes/shaders/object_particle_dot_vert.glsl SRC)
-data_to_c_simple(modes/shaders/object_particle_dot_frag.glsl SRC)
-data_to_c_simple(modes/shaders/object_loose_points_frag.glsl SRC)
-data_to_c_simple(modes/shaders/paint_vertex_frag.glsl SRC)
-data_to_c_simple(modes/shaders/paint_vertex_vert.glsl SRC)
-data_to_c_simple(modes/shaders/paint_face_selection_vert.glsl SRC)
-data_to_c_simple(modes/shaders/paint_wire_frag.glsl SRC)
-data_to_c_simple(modes/shaders/paint_vert_frag.glsl SRC)
-data_to_c_simple(modes/shaders/particle_strand_frag.glsl SRC)
-data_to_c_simple(modes/shaders/particle_strand_vert.glsl SRC)
-data_to_c_simple(modes/shaders/pose_selection_vert.glsl SRC)
-data_to_c_simple(modes/shaders/volume_velocity_vert.glsl SRC)
+data_to_c_simple(intern/shaders/common_colormanagement_lib.glsl SRC)
+data_to_c_simple(intern/shaders/common_globals_lib.glsl SRC)
+data_to_c_simple(intern/shaders/common_hair_lib.glsl SRC)
+data_to_c_simple(intern/shaders/common_hair_refine_vert.glsl SRC)
+data_to_c_simple(intern/shaders/common_view_lib.glsl SRC)
+data_to_c_simple(intern/shaders/common_fxaa_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)
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 9554e9c0275..a1a1f7cc389 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -33,8 +33,6 @@
#include "DNA_screen_types.h"
#include "DNA_view3d_types.h"
-#include "draw_mode_engines.h"
-
#include "GPU_texture.h"
#include "gpencil_engine.h"
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h b/source/blender/draw/engines/gpencil/gpencil_engine.h
index 36bc205f41a..04ed19830ed 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.h
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.h
@@ -25,6 +25,8 @@
#include "GPU_batch.h"
+extern DrawEngineType draw_engine_gpencil_type;
+
struct GPENCIL_Data;
struct GPENCIL_StorageList;
struct MaterialGPencilStyle;
diff --git a/source/blender/draw/engines/gpencil/gpencil_render.c b/source/blender/draw/engines/gpencil/gpencil_render.c
index 81e48eb05f2..8c126310ea2 100644
--- a/source/blender/draw/engines/gpencil/gpencil_render.c
+++ b/source/blender/draw/engines/gpencil/gpencil_render.c
@@ -29,8 +29,6 @@
#include "DEG_depsgraph_query.h"
-#include "draw_mode_engines.h"
-
#include "RE_pipeline.h"
#include "gpencil_engine.h"
diff --git a/source/blender/draw/engines/overlay/overlay_armature.c b/source/blender/draw/engines/overlay/overlay_armature.c
index 7dc4c4b4a35..1ed147d393a 100644
--- a/source/blender/draw/engines/overlay/overlay_armature.c
+++ b/source/blender/draw/engines/overlay/overlay_armature.c
@@ -117,6 +117,29 @@ typedef struct ArmatureDrawContext {
const ThemeWireColor *bcolor; /* pchan color */
} ArmatureDrawContext;
+/**
+ * Return true if armature should be handled by the pose mode engine.
+ */
+bool OVERLAY_armature_is_pose_mode(Object *ob, const DRWContextState *draw_ctx)
+{
+ Object *active_ob = draw_ctx->obact;
+
+ /* Pose armature is handled by pose mode engine. */
+ if (((ob == active_ob) || (ob->mode & OB_MODE_POSE)) &&
+ ((draw_ctx->object_mode & OB_MODE_POSE) != 0)) {
+ return true;
+ }
+
+ /* Armature parent is also handled by pose mode engine. */
+ if ((active_ob != NULL) && ((draw_ctx->object_mode & OB_MODE_WEIGHT_PAINT) != 0)) {
+ if (ob == draw_ctx->object_pose) {
+ return true;
+ }
+ }
+
+ return false;
+}
+
void OVERLAY_armature_cache_init(OVERLAY_Data *vedata)
{
OVERLAY_PassList *psl = vedata->psl;
diff --git a/source/blender/draw/engines/overlay/overlay_engine.c b/source/blender/draw/engines/overlay/overlay_engine.c
index 40e6d2c39b2..e6fab584643 100644
--- a/source/blender/draw/engines/overlay/overlay_engine.c
+++ b/source/blender/draw/engines/overlay/overlay_engine.c
@@ -172,7 +172,7 @@ static void OVERLAY_cache_populate(void *vedata, Object *ob)
const DRWContextState *draw_ctx = DRW_context_state_get();
const bool is_select = DRW_state_is_select();
const bool renderable = DRW_object_is_renderable(ob);
- const bool in_pose_mode = ob->type == OB_ARMATURE && DRW_pose_mode_armature(ob, draw_ctx->obact);
+ const bool in_pose_mode = ob->type == OB_ARMATURE && OVERLAY_armature_is_pose_mode(ob, draw_ctx);
const bool in_edit_mode = BKE_object_is_in_editmode(ob);
const bool in_part_edit_mode = ob->mode == OB_MODE_PARTICLE_EDIT;
const bool in_paint_mode = (ob == draw_ctx->obact) &&
diff --git a/source/blender/draw/engines/overlay/overlay_motion_path.c b/source/blender/draw/engines/overlay/overlay_motion_path.c
index c81887b9d89..d238fda218d 100644
--- a/source/blender/draw/engines/overlay/overlay_motion_path.c
+++ b/source/blender/draw/engines/overlay/overlay_motion_path.c
@@ -208,7 +208,7 @@ void OVERLAY_motion_path_cache_populate(OVERLAY_Data *vedata, Object *ob)
const DRWContextState *draw_ctx = DRW_context_state_get();
if (ob->type == OB_ARMATURE) {
- if (DRW_pose_mode_armature(ob, draw_ctx->obact)) {
+ if (OVERLAY_armature_is_pose_mode(ob, draw_ctx)) {
for (bPoseChannel *pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
if (pchan->mpath) {
motion_path_c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list