diff options
Diffstat (limited to 'source/blender/editors')
9 files changed, 8 insertions, 13 deletions
diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index 2ee8918c5da..a511100ff4e 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -48,7 +48,7 @@ #include "BLT_translation.h" -#include "BKE_DerivedMesh.h" +#include "BKE_bvhutils.h" #include "BKE_context.h" #include "BKE_editmesh.h" #include "BKE_editmesh_bvh.h" diff --git a/source/blender/editors/mesh/editmesh_undo.c b/source/blender/editors/mesh/editmesh_undo.c index 97445ebc9e0..11606840b42 100644 --- a/source/blender/editors/mesh/editmesh_undo.c +++ b/source/blender/editors/mesh/editmesh_undo.c @@ -27,6 +27,7 @@ #include "CLG_log.h" #include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_key_types.h" #include "DNA_layer_types.h" @@ -35,7 +36,6 @@ #include "BLI_array_utils.h" #include "BLI_alloca.h" -#include "BKE_DerivedMesh.h" #include "BKE_context.h" #include "BKE_key.h" #include "BKE_layer.h" diff --git a/source/blender/editors/render/render_update.c b/source/blender/editors/render/render_update.c index a78617fde8c..97fd7295a7b 100644 --- a/source/blender/editors/render/render_update.c +++ b/source/blender/editors/render/render_update.c @@ -49,7 +49,6 @@ #include "BLI_utildefines.h" #include "BKE_context.h" -#include "BKE_DerivedMesh.h" #include "BKE_icons.h" #include "BKE_layer.h" #include "BKE_main.h" diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 7fbf7889551..40311594512 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -57,7 +57,6 @@ #include "BKE_colortools.h" #include "BKE_context.h" -#include "BKE_DerivedMesh.h" #include "BKE_icons.h" #include "BKE_image.h" #include "BKE_global.h" diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c index d90f1b16d29..c6874a663a5 100644 --- a/source/blender/editors/space_view3d/drawvolume.c +++ b/source/blender/editors/space_view3d/drawvolume.c @@ -40,8 +40,8 @@ #include "BLI_utildefines.h" #include "BLI_math.h" -#include "BKE_DerivedMesh.h" #include "BKE_colorband.h" +#include "BKE_deform.h" #include "BKE_particle.h" #include "smoke_API.h" @@ -685,7 +685,7 @@ static void add_needle(float (*verts)[3], float (*colors)[3], float center[3], float len = len_v3(dir); float rgb[3]; - weight_to_rgb(rgb, len); + BKE_defvert_weight_to_rgb(rgb, len); if (len != 0.0f) { mul_v3_fl(dir, 1.0f / len); @@ -725,7 +725,7 @@ static void add_streamline(float (*verts)[3], float(*colors)[3], float center[3] const float len = len_v3(dir); float rgb[3]; - weight_to_rgb(rgb, len); + BKE_defvert_weight_to_rgb(rgb, len); copy_v3_v3(colors[(*offset)], rgb); copy_v3_v3(verts[(*offset)++], center); diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c b/source/blender/editors/space_view3d/view3d_draw_legacy.c index 6acec568bf4..06cdba3f537 100644 --- a/source/blender/editors/space_view3d/view3d_draw_legacy.c +++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c @@ -57,7 +57,6 @@ #include "BKE_camera.h" #include "BKE_context.h" #include "BKE_customdata.h" -#include "BKE_DerivedMesh.h" #include "BKE_image.h" #include "BKE_key.h" #include "BKE_layer.h" diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index 4eb2a016b94..8263d1d892c 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -41,7 +41,6 @@ struct Base; struct BoundBox; struct Gwn_Batch; struct Depsgraph; -struct DerivedMesh; struct Object; struct SmokeDomainSettings; struct bAnimVizSettings; diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 8462004c549..c622a50ff11 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -61,7 +61,6 @@ #include "BLI_bitmap.h" #include "BLI_rect.h" -#include "BKE_DerivedMesh.h" #include "BKE_action.h" #include "BKE_armature.h" #include "BKE_constraint.h" diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c index 08df08dafb4..5fb328a922d 100644 --- a/source/blender/editors/uvedit/uvedit_draw.c +++ b/source/blender/editors/uvedit/uvedit_draw.c @@ -48,7 +48,7 @@ #include "BLI_buffer.h" #include "BLI_bitmap.h" -#include "BKE_DerivedMesh.h" +#include "BKE_deform.h" #include "BKE_editmesh.h" #include "BKE_material.h" #include "BKE_layer.h" @@ -277,7 +277,7 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, Object *obedit, BME else areadiff = 1.0f - (area / uvarea); - weight_to_rgb(col, areadiff); + BKE_defvert_weight_to_rgb(col, areadiff); immUniformColor3fv(col); /* TODO: use editmesh tessface */ @@ -357,7 +357,7 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, Object *obedit, BME BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) { luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset); a = fabsf(uvang[i] - ang[i]) / (float)M_PI; - weight_to_rgb(col, 1.0f - pow2f(1.0f - a)); + BKE_defvert_weight_to_rgb(col, 1.0f - pow2f(1.0f - a)); immAttrib3fv(color, col); immVertex2fv(pos, luv->uv); } |