griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Remove unused Grease Pencil legacy code

Browse Source
This commit is contained in:
Hans Goudey
2024-12-17 09:56:17 -05:00
parent c4b8210c55
commit 75ede253aa
6 changed files with 0 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/blenkernel/BKE_armature.hh
View File

@@ -29,7 +29,6 @@ struct PoseTree;
struct Scene;
struct bArmature;
struct bConstraint;
struct bGPDstroke;
struct bPose;
struct bPoseChannel;
struct MDeformVert;
@@ -629,16 +628,6 @@ void BKE_pose_eval_cleanup(Depsgraph *depsgraph, Scene *scene, Object *object);
/* Note that we could have a 'BKE_armature_deform_coords' that doesn't take object data
* currently there are no callers for this though. */
void BKE_armature_deform_coords_with_gpencil_stroke(const Object *ob_arm,
const Object *ob_target,
float (*vert_coords)[3],
float (*vert_deform_mats)[3][3],
int vert_coords_len,
int deformflag,
float (*vert_coords_prev)[3],
const char *defgrp_name,
bGPDstroke *gps_target);
void BKE_armature_deform_coords_with_curves(
const Object &ob_arm,
const Object &ob_target,

7
source/blender/blenkernel/BKE_shrinkwrap.hh
View File

@@ -121,13 +121,6 @@ void shrinkwrapModifier_deform(ShrinkwrapModifierData *smd,
int defgrp_index,
float (*vertexCos)[3],
int numVerts);
/* Implementation of the Shrinkwrap Grease Pencil modifier. */
void shrinkwrapGpencilModifier_deform(ShrinkwrapGpencilModifierData *mmd,
Object *ob,
MDeformVert *dvert,
int defgrp_index,
float (*vertexCos)[3],
int numVerts);
struct ShrinkwrapParams {
/** Shrink target. */

26
source/blender/blenkernel/intern/armature_deform.cc
View File

@@ -606,32 +606,6 @@ static void armature_deform_coords_impl(const Object *ob_arm,
}
}
void BKE_armature_deform_coords_with_gpencil_stroke(const Object *ob_arm,
const Object *ob_target,
float (*vert_coords)[3],
float (*vert_deform_mats)[3][3],
int vert_coords_len,
int deformflag,
float (*vert_coords_prev)[3],
const char *defgrp_name,
bGPDstroke *gps_target)
{
const ListBase *defbase = BKE_id_defgroup_list_get(static_cast<const ID *>(ob_target->data));
const blender::Span<MDeformVert> dverts = {gps_target->dvert, gps_target->totpoints};
armature_deform_coords_impl(ob_arm,
ob_target,
defbase,
vert_coords,
vert_deform_mats,
vert_coords_len,
deformflag,
vert_coords_prev,
defgrp_name,
dverts,
nullptr,
nullptr);
}
void BKE_armature_deform_coords_with_curves(
const Object &ob_arm,
const Object &ob_target,

49
source/blender/blenkernel/intern/shrinkwrap.cc
View File

@@ -1463,55 +1463,6 @@ void shrinkwrapModifier_deform(ShrinkwrapModifierData *smd,
}
}
void shrinkwrapGpencilModifier_deform(ShrinkwrapGpencilModifierData *mmd,
Object *ob,
MDeformVert *dvert,
const int defgrp_index,
float (*vertexCos)[3],
int numVerts)
{
ShrinkwrapCalcData calc = NULL_ShrinkwrapCalcData;
/* Convert gpencil struct to use the same struct and function used with meshes. */
ShrinkwrapModifierData smd;
smd.target = mmd->target;
smd.auxTarget = mmd->aux_target;
smd.keepDist = mmd->keep_dist;
smd.shrinkType = mmd->shrink_type;
smd.shrinkOpts = mmd->shrink_opts;
smd.shrinkMode = mmd->shrink_mode;
smd.projLimit = mmd->proj_limit;
smd.projAxis = mmd->proj_axis;
/* Configure Shrinkwrap calc data. */
calc.smd = &smd;
calc.ob = ob;
calc.numVerts = numVerts;
calc.vertexCos = vertexCos;
calc.dvert = dvert;
calc.vgroup = defgrp_index;
calc.invert_vgroup = (mmd->flag & GP_SHRINKWRAP_INVERT_VGROUP) != 0;
BLI_SPACE_TRANSFORM_SETUP(&calc.local2target, ob, mmd->target);
calc.keepDist = mmd->keep_dist;
calc.tree = mmd->cache_data;
switch (mmd->shrink_type) {
case MOD_SHRINKWRAP_NEAREST_SURFACE:
case MOD_SHRINKWRAP_TARGET_PROJECT:
TIMEIT_BENCH(shrinkwrap_calc_nearest_surface_point(&calc), gpdeform_surface);
break;
case MOD_SHRINKWRAP_PROJECT:
TIMEIT_BENCH(shrinkwrap_calc_normal_projection(&calc), gpdeform_project);
break;
case MOD_SHRINKWRAP_NEAREST_VERTEX:
TIMEIT_BENCH(shrinkwrap_calc_nearest_vertex(&calc), gpdeform_vertex);
break;
}
}
void shrinkwrapParams_deform(const ShrinkwrapParams &params,
Object &object,
ShrinkwrapTreeData &tree,

1
source/blender/draw/engines/gpencil/gpencil_engine.h
View File

@@ -38,7 +38,6 @@ struct Object;
struct RenderEngine;
struct RenderLayer;
struct View3D;
struct bGPDstroke;
/* used to convert pixel scale. */
#define GPENCIL_PIXEL_FACTOR 2000.0f

1
source/blender/draw/intern/draw_cache.hh
View File

@@ -22,7 +22,6 @@ struct Object;
struct PTCacheEdit;
struct ParticleSystem;
struct Volume;
struct bGPDstroke;
struct Scene;
/**