archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

- use more inline math funcitons where possible

Browse Source 
- swapped in less verbose math functons
- modifier include cleanup
This commit is contained in:
Campbell Barton
2010-04-12 00:36:50 +00:00
parent 7d98982295
commit 8c3ab1c2a4
43 changed files with 203 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/BKE_fluidsim.h
View File

@@ -34,6 +34,7 @@
struct Object; struct Object;
struct Scene; struct Scene;
struct FluidsimModifierData; struct FluidsimModifierData;
struct FluidsimSettings;
struct DerivedMesh; struct DerivedMesh;
struct MVert; struct MVert;

1
source/blender/blenkernel/BKE_object.h
View File

@@ -46,6 +46,7 @@ struct BulletSoftBody;
struct Group; struct Group;
struct bAction; struct bAction;
struct RenderData; struct RenderData;
struct rctf;
void clear_workob(struct Object *workob); void clear_workob(struct Object *workob);
void what_does_parent(struct Scene *scene, struct Object *ob, struct Object *workob); void what_does_parent(struct Scene *scene, struct Object *ob, struct Object *workob);

2
source/blender/blenkernel/BKE_shrinkwrap.h
View File

@@ -107,7 +107,7 @@ typedef struct ShrinkwrapCalcData
struct Object *ob; //object we are applying shrinkwrap to struct Object *ob; //object we are applying shrinkwrap to
MVert *vert; //Array of verts being projected (to fetch normals or other data) struct MVert *vert; //Array of verts being projected (to fetch normals or other data)
float (*vertexCos)[3]; //vertexs being shrinkwraped float (*vertexCos)[3]; //vertexs being shrinkwraped
int numVerts; int numVerts;

4
source/blender/blenkernel/BKE_subsurf.h
View File

@@ -52,7 +52,7 @@ struct DerivedMesh *subsurf_make_derived_from_derived(
int useRenderParams, float (*vertCos)[3], int useRenderParams, float (*vertCos)[3],
int isFinalCalc, int editMode); int isFinalCalc, int editMode);
void subsurf_calculate_limit_positions(Mesh *me, float (*positions_r)[3]); void subsurf_calculate_limit_positions(struct Mesh *me, float (*positions_r)[3]);
/**************************** Internal *****************************/ /**************************** Internal *****************************/
@@ -87,7 +87,7 @@ typedef struct CCGDerivedMesh {
int lvl, totlvl; int lvl, totlvl;
float (*orco)[3]; float (*orco)[3];
Object *ob; struct Object *ob;
int modified; int modified;
void (*update)(DerivedMesh*); void (*update)(DerivedMesh*);

6
source/blender/blenkernel/intern/constraint.c
View File

@@ -1983,8 +1983,10 @@ static void pycon_id_looper (bConstraint *con, ConstraintIDFunc func, void *user
/* Whether this approach is maintained remains to be seen (aligorith) */ /* Whether this approach is maintained remains to be seen (aligorith) */
static void pycon_get_tarmat (bConstraint *con, bConstraintOb *cob, bConstraintTarget *ct, float ctime) static void pycon_get_tarmat (bConstraint *con, bConstraintOb *cob, bConstraintTarget *ct, float ctime)
{ {
#ifndef DISABLE_PYTHON
bPythonConstraint *data= con->data; bPythonConstraint *data= con->data;
#endif
if (VALID_CONS_TARGET(ct)) { if (VALID_CONS_TARGET(ct)) {
/* special exception for curves - depsgraph issues */ /* special exception for curves - depsgraph issues */
if (ct->tar->type == OB_CURVE) { if (ct->tar->type == OB_CURVE) {
@@ -3573,7 +3575,7 @@ static void shrinkwrap_get_tarmat (bConstraint *con, bConstraintOb *cob, bConstr
} }
/* co is in local object coordinates, change it to global and update target position */ /* co is in local object coordinates, change it to global and update target position */
mul_v3_m4v3(co, cob->matrix, co); mul_m4_v3(cob->matrix, co);
VECCOPY(ct->matrix[3], co); VECCOPY(ct->matrix[3], co);
} }
} }

8
source/blender/editors/mesh/editmesh_lib.c
View File

@@ -1316,8 +1316,8 @@ static short extrudeflag_edge(Object *obedit, EditMesh *em, short flag, float *n
copy_v3_v3(co2, eed->v2->co); copy_v3_v3(co2, eed->v2->co);
if (mmd->mirror_ob) { if (mmd->mirror_ob) {
mul_v3_m4v3(co1, mtx, co1); mul_m4_v3(mtx, co1);
mul_v3_m4v3(co2, mtx, co2); mul_m4_v3(mtx, co2);
} }
if (mmd->flag & MOD_MIR_AXIS_X) if (mmd->flag & MOD_MIR_AXIS_X)
@@ -1605,8 +1605,8 @@ short extrudeflag_vert(Object *obedit, EditMesh *em, short flag, float *nor, int
copy_v3_v3(co2, eed->v2->co); copy_v3_v3(co2, eed->v2->co);
if (mmd->mirror_ob) { if (mmd->mirror_ob) {
mul_v3_m4v3(co1, mtx, co1); mul_m4_v3(mtx, co1);
mul_v3_m4v3(co2, mtx, co2); mul_m4_v3(mtx, co2);
} }
if (mmd->flag & MOD_MIR_AXIS_X) if (mmd->flag & MOD_MIR_AXIS_X)

6
source/blender/editors/transform/transform_generics.c
View File

@@ -189,8 +189,8 @@ static void clipMirrorModifier(TransInfo *t, Object *ob)
copy_v3_v3(iloc, td->iloc); copy_v3_v3(iloc, td->iloc);
if (mmd->mirror_ob) { if (mmd->mirror_ob) {
mul_v3_m4v3(loc, mtx, loc); mul_m4_v3(mtx, loc);
mul_v3_m4v3(iloc, mtx, iloc); mul_m4_v3(mtx, iloc);
} }
clip = 0; clip = 0;
@@ -218,7 +218,7 @@ static void clipMirrorModifier(TransInfo *t, Object *ob)
} }
if (clip) { if (clip) {
if (mmd->mirror_ob) { if (mmd->mirror_ob) {
mul_v3_m4v3(loc, imtx, loc); mul_m4_v3(imtx, loc);
} }
copy_v3_v3(td->loc, loc); copy_v3_v3(td->loc, loc);
} }

8
source/blender/modifiers/intern/MOD_armature.c
View File

@@ -51,8 +51,6 @@
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"
@@ -130,7 +128,7 @@ static void foreachObjectLink(
} }
static void updateDepgraph( static void updateDepgraph(
ModifierData *md, DagForest *forest, Scene *scene, Object *ob, ModifierData *md, DagForest *forest, struct Scene *scene, Object *ob,
DagNode *obNode) DagNode *obNode)
{ {
ArmatureModifierData *amd = (ArmatureModifierData*) md; ArmatureModifierData *amd = (ArmatureModifierData*) md;
@@ -162,7 +160,7 @@ static void deformVerts(
} }
static void deformVertsEM( static void deformVertsEM(
ModifierData *md, Object *ob, EditMesh *editData, ModifierData *md, Object *ob, struct EditMesh *editData,
DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts)
{ {
ArmatureModifierData *amd = (ArmatureModifierData*) md; ArmatureModifierData *amd = (ArmatureModifierData*) md;
@@ -177,7 +175,7 @@ static void deformVertsEM(
} }
static void deformMatricesEM( static void deformMatricesEM(
ModifierData *md, Object *ob, EditMesh *editData, ModifierData *md, Object *ob, struct EditMesh *editData,
DerivedMesh *derivedData, float (*vertexCos)[3], DerivedMesh *derivedData, float (*vertexCos)[3],
float (*defMats)[3][3], int numVerts) float (*defMats)[3][3], int numVerts)
{ {

32
source/blender/modifiers/intern/MOD_array.c
View File

@@ -36,9 +36,10 @@
#include "math.h" #include "math.h"
#include "float.h" #include "float.h"
#include "BLI_kdtree.h" #include "BLI_math.h"
#include "BLI_rand.h" #include "BLI_rand.h"
#include "BLI_uvproject.h" #include "BLI_ghash.h"
#include "BLI_edgehash.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
@@ -47,12 +48,10 @@
#include "DNA_curve_types.h" #include "DNA_curve_types.h"
#include "DNA_key_types.h" #include "DNA_key_types.h"
#include "DNA_material_types.h" #include "DNA_material_types.h"
#include "DNA_object_fluidsim.h" #include "DNA_meshdata_types.h"
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"
@@ -110,8 +109,8 @@ static void copyData(ModifierData *md, ModifierData *target)
tamd->curve_ob = amd->curve_ob; tamd->curve_ob = amd->curve_ob;
tamd->offset_ob = amd->offset_ob; tamd->offset_ob = amd->offset_ob;
tamd->count = amd->count; tamd->count = amd->count;
VECCOPY(tamd->offset, amd->offset); copy_v3_v3(tamd->offset, amd->offset);
VECCOPY(tamd->scale, amd->scale); copy_v3_v3(tamd->scale, amd->scale);
tamd->length = amd->length; tamd->length = amd->length;
tamd->merge_dist = amd->merge_dist; tamd->merge_dist = amd->merge_dist;
tamd->fit_type = amd->fit_type; tamd->fit_type = amd->fit_type;
@@ -132,7 +131,7 @@ static void foreachObjectLink(
walk(userData, ob, &amd->offset_ob); walk(userData, ob, &amd->offset_ob);
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, Scene *scene, static void updateDepgraph(ModifierData *md, DagForest *forest, struct Scene *scene,
Object *ob, DagNode *obNode) Object *ob, DagNode *obNode)
{ {
ArrayModifierData *amd = (ArrayModifierData*) md; ArrayModifierData *amd = (ArrayModifierData*) md;
@@ -221,7 +220,7 @@ static int calc_mapping(IndexMapEntry *indexMap, int oldIndex, int copyNum)
} }
static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
Scene *scene, Object *ob, DerivedMesh *dm, struct Scene *scene, Object *ob, DerivedMesh *dm,
int initFlags) int initFlags)
{ {
int i, j; int i, j;
@@ -365,7 +364,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
indexMap[i].new = numVerts - 1; indexMap[i].new = numVerts - 1;
VECCOPY(co, mv->co); copy_v3_v3(co, mv->co);
/* Attempts to merge verts from one duplicate with verts from the /* Attempts to merge verts from one duplicate with verts from the
* next duplicate which are closer than amd->merge_dist. * next duplicate which are closer than amd->merge_dist.
@@ -375,8 +374,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
*/ */
if((count > 1) && (amd->flags & MOD_ARR_MERGE)) { if((count > 1) && (amd->flags & MOD_ARR_MERGE)) {
float tmp_co[3]; float tmp_co[3];
VECCOPY(tmp_co, mv->co); mul_v3_m4v3(tmp_co, offset, mv->co);
mul_m4_v3(offset, tmp_co);
for(j = 0; j < maxVerts; j++) { for(j = 0; j < maxVerts; j++) {
/* if vertex already merged, don't use it */ /* if vertex already merged, don't use it */
@@ -389,7 +387,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
/* test for merging with final copy of merge target */ /* test for merging with final copy of merge target */
if(amd->flags & MOD_ARR_MERGEFINAL) { if(amd->flags & MOD_ARR_MERGEFINAL) {
VECCOPY(tmp_co, inMV->co); copy_v3_v3(tmp_co, inMV->co);
inMV = &src_mvert[i]; inMV = &src_mvert[i];
mul_m4_v3(final_offset, tmp_co); mul_m4_v3(final_offset, tmp_co);
if(compare_len_v3v3(tmp_co, inMV->co, amd->merge_dist)) if(compare_len_v3v3(tmp_co, inMV->co, amd->merge_dist))
@@ -410,7 +408,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
numVerts++; numVerts++;
mul_m4_v3(offset, co); mul_m4_v3(offset, co);
VECCOPY(mv2->co, co); copy_v3_v3(mv2->co, co);
} }
} else if(indexMap[i].merge != i && indexMap[i].merge_final) { } else if(indexMap[i].merge != i && indexMap[i].merge_final) {
/* if this vert is not merging with itself, and it is merging /* if this vert is not merging with itself, and it is merging
@@ -581,7 +579,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
MVert *in_mv; MVert *in_mv;
int j; int j;
VECCOPY(tmp_co, mv->co); copy_v3_v3(tmp_co, mv->co);
mul_m4_v3(startoffset, tmp_co); mul_m4_v3(startoffset, tmp_co);
for(j = 0; j < maxVerts; j++) { for(j = 0; j < maxVerts; j++) {
@@ -682,7 +680,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
MVert *in_mv; MVert *in_mv;
int j; int j;
VECCOPY(tmp_co, mv->co); copy_v3_v3(tmp_co, mv->co);
mul_m4_v3(offset, tmp_co); mul_m4_v3(offset, tmp_co);
for(j = 0; j < maxVerts; j++) { for(j = 0; j < maxVerts; j++) {
@@ -777,7 +775,7 @@ static DerivedMesh *applyModifier(
} }
static DerivedMesh *applyModifierEM( static DerivedMesh *applyModifierEM(
ModifierData *md, Object *ob, EditMesh *editData, ModifierData *md, Object *ob, struct EditMesh *editData,
DerivedMesh *derivedData) DerivedMesh *derivedData)
{ {
return applyModifier(md, ob, derivedData, 0, 1); return applyModifier(md, ob, derivedData, 0, 1);

1
source/blender/modifiers/intern/MOD_bevel.c
View File

@@ -52,7 +52,6 @@
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h" #include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"

4
source/blender/modifiers/intern/MOD_boolean.c
View File

@@ -51,8 +51,6 @@
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"
@@ -108,7 +106,7 @@ static void foreachObjectLink(
} }
static void updateDepgraph( static void updateDepgraph(
ModifierData *md, DagForest *forest, Scene *scene, Object *ob, ModifierData *md, DagForest *forest, struct Scene *scene, Object *ob,
DagNode *obNode) DagNode *obNode)
{ {
BooleanModifierData *bmd = (BooleanModifierData*) md; BooleanModifierData *bmd = (BooleanModifierData*) md;

10
source/blender/modifiers/intern/MOD_build.c
View File

@@ -39,20 +39,16 @@
#include "BLI_kdtree.h" #include "BLI_kdtree.h"
#include "BLI_rand.h" #include "BLI_rand.h"
#include "BLI_uvproject.h" #include "BLI_uvproject.h"
#include "BLI_ghash.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "DNA_armature_types.h" #include "DNA_scene_types.h"
#include "DNA_camera_types.h" #include "DNA_meshdata_types.h"
#include "DNA_curve_types.h"
#include "DNA_key_types.h"
#include "DNA_material_types.h"
#include "DNA_object_fluidsim.h" #include "DNA_object_fluidsim.h"
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"

45
source/blender/modifiers/intern/MOD_cast.c
View File

@@ -36,9 +36,7 @@
#include "math.h" #include "math.h"
#include "float.h" #include "float.h"
#include "BLI_kdtree.h" #include "BLI_math.h"
#include "BLI_rand.h"
#include "BLI_uvproject.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
@@ -49,10 +47,13 @@
#include "DNA_material_types.h" #include "DNA_material_types.h"
#include "DNA_object_fluidsim.h" #include "DNA_object_fluidsim.h"
#include "DNA_object_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_scene_types.h"
#include "DNA_customdata_types.h"
#include "BKE_DerivedMesh.h"
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"
@@ -70,7 +71,7 @@
#include "BKE_scene.h" #include "BKE_scene.h"
#include "BKE_smoke.h" #include "BKE_smoke.h"
#include "BKE_softbody.h" #include "BKE_softbody.h"
#include "BKE_subsurf.h" #include "BKE_utildefines.h"
#include "BKE_texture.h" #include "BKE_texture.h"
#include "depsgraph_private.h" #include "depsgraph_private.h"
@@ -143,7 +144,7 @@ static void foreachObjectLink(
} }
static void updateDepgraph( static void updateDepgraph(
ModifierData *md, DagForest *forest, Scene *scene, Object *ob, ModifierData *md, DagForest *forest, struct Scene *scene, Object *ob,
DagNode *obNode) DagNode *obNode)
{ {
CastModifierData *cmd = (CastModifierData*) md; CastModifierData *cmd = (CastModifierData*) md;
@@ -193,8 +194,7 @@ static void sphere_do(
} }
invert_m4_m4(ob->imat, ob->obmat); invert_m4_m4(ob->imat, ob->obmat);
VECCOPY(center, ctrl_ob->obmat[3]); mul_v3_m4v3(center, ob->imat, ctrl_ob->obmat[3]);
mul_m4_v3(ob->imat, center);
} }
/* now we check which options the user wants */ /* now we check which options the user wants */
@@ -239,7 +239,7 @@ static void sphere_do(
int j; int j;
float tmp_co[3]; float tmp_co[3];
VECCOPY(tmp_co, vertexCos[i]); copy_v3_v3(tmp_co, vertexCos[i]);
if(ctrl_ob) { if(ctrl_ob) {
if(flag & MOD_CAST_USE_OB_TRANSFORM) { if(flag & MOD_CAST_USE_OB_TRANSFORM) {
mul_m4_v3(mat, tmp_co); mul_m4_v3(mat, tmp_co);
@@ -248,7 +248,7 @@ static void sphere_do(
} }
} }
VECCOPY(vec, tmp_co); copy_v3_v3(vec, tmp_co);
if (type == MOD_CAST_TYPE_CYLINDER) if (type == MOD_CAST_TYPE_CYLINDER)
vec[2] = 0.0f; vec[2] = 0.0f;
@@ -285,7 +285,7 @@ static void sphere_do(
} }
} }
VECCOPY(vertexCos[i], tmp_co); copy_v3_v3(vertexCos[i], tmp_co);
} }
return; return;
} }
@@ -294,7 +294,7 @@ static void sphere_do(
for (i = 0; i < numVerts; i++) { for (i = 0; i < numVerts; i++) {
float tmp_co[3]; float tmp_co[3];
VECCOPY(tmp_co, vertexCos[i]); copy_v3_v3(tmp_co, vertexCos[i]);
if(ctrl_ob) { if(ctrl_ob) {
if(flag & MOD_CAST_USE_OB_TRANSFORM) { if(flag & MOD_CAST_USE_OB_TRANSFORM) {
mul_m4_v3(mat, tmp_co); mul_m4_v3(mat, tmp_co);
@@ -303,7 +303,7 @@ static void sphere_do(
} }
} }
VECCOPY(vec, tmp_co); copy_v3_v3(vec, tmp_co);
if (type == MOD_CAST_TYPE_CYLINDER) if (type == MOD_CAST_TYPE_CYLINDER)
vec[2] = 0.0f; vec[2] = 0.0f;
@@ -329,7 +329,7 @@ static void sphere_do(
} }
} }
VECCOPY(vertexCos[i], tmp_co); copy_v3_v3(vertexCos[i], tmp_co);
} }
} }
@@ -377,8 +377,7 @@ static void cuboid_do(
} }
invert_m4_m4(ob->imat, ob->obmat); invert_m4_m4(ob->imat, ob->obmat);
VECCOPY(center, ctrl_ob->obmat[3]); mul_v3_m4v3(center, ob->imat, ctrl_ob->obmat[3]);
mul_m4_v3(ob->imat, center);
} }
if((flag & MOD_CAST_SIZE_FROM_RADIUS) && has_radius) { if((flag & MOD_CAST_SIZE_FROM_RADIUS) && has_radius) {
@@ -447,7 +446,7 @@ static void cuboid_do(
float d[3], dmax, apex[3], fbb; float d[3], dmax, apex[3], fbb;
float tmp_co[3]; float tmp_co[3];
VECCOPY(tmp_co, vertexCos[i]); copy_v3_v3(tmp_co, vertexCos[i]);
if(ctrl_ob) { if(ctrl_ob) {
if(flag & MOD_CAST_USE_OB_TRANSFORM) { if(flag & MOD_CAST_USE_OB_TRANSFORM) {
mul_m4_v3(mat, tmp_co); mul_m4_v3(mat, tmp_co);
@@ -532,7 +531,7 @@ static void cuboid_do(
} }
} }
VECCOPY(vertexCos[i], tmp_co); copy_v3_v3(vertexCos[i], tmp_co);
} }
return; return;
} }
@@ -543,12 +542,12 @@ static void cuboid_do(
float d[3], dmax, fbb, apex[3]; float d[3], dmax, fbb, apex[3];
float tmp_co[3]; float tmp_co[3];
VECCOPY(tmp_co, vertexCos[i]); copy_v3_v3(tmp_co, vertexCos[i]);
if(ctrl_ob) { if(ctrl_ob) {
if(flag & MOD_CAST_USE_OB_TRANSFORM) { if(flag & MOD_CAST_USE_OB_TRANSFORM) {
mul_m4_v3(mat, tmp_co); mul_m4_v3(mat, tmp_co);
} else { } else {
sub_v3_v3v3(tmp_co, tmp_co, center); sub_v3_v3(tmp_co, center);
} }
} }
@@ -600,7 +599,7 @@ static void cuboid_do(
} }
} }
VECCOPY(vertexCos[i], tmp_co); copy_v3_v3(vertexCos[i], tmp_co);
} }
} }
@@ -624,7 +623,7 @@ static void deformVerts(
} }
static void deformVertsEM( static void deformVertsEM(
ModifierData *md, Object *ob, EditMesh *editData, ModifierData *md, Object *ob, struct EditMesh *editData,
DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts)
{ {
DerivedMesh *dm = get_dm(md->scene, ob, editData, derivedData, NULL, 0); DerivedMesh *dm = get_dm(md->scene, ob, editData, derivedData, NULL, 0);

1
source/blender/modifiers/intern/MOD_cloth.c
View File

@@ -51,7 +51,6 @@
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h" #include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"

16
source/blender/modifiers/intern/MOD_collision.c
View File

@@ -38,21 +38,15 @@
#include "BLI_kdtree.h" #include "BLI_kdtree.h"
#include "BLI_rand.h" #include "BLI_rand.h"
#include "BLI_uvproject.h" #include "BLI_math.h"
#include "BLI_edgehash.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "DNA_armature_types.h" #include "DNA_scene_types.h"
#include "DNA_camera_types.h" #include "DNA_meshdata_types.h"
#include "DNA_curve_types.h"
#include "DNA_key_types.h"
#include "DNA_material_types.h"
#include "DNA_object_fluidsim.h"
#include "BKE_collision.h"
#include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"

6
source/blender/modifiers/intern/MOD_curve.c
View File

@@ -42,7 +42,7 @@
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "DNA_armature_types.h" #include "DNA_scene_types.h"
#include "DNA_camera_types.h" #include "DNA_camera_types.h"
#include "DNA_curve_types.h" #include "DNA_curve_types.h"
#include "DNA_key_types.h" #include "DNA_key_types.h"
@@ -51,8 +51,6 @@
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"
@@ -156,7 +154,7 @@ static void deformVerts(
} }
static void deformVertsEM( static void deformVertsEM(
ModifierData *md, Object *ob, EditMesh *editData, ModifierData *md, Object *ob, struct EditMesh *editData,
DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts)
{ {
DerivedMesh *dm = derivedData; DerivedMesh *dm = derivedData;

18
source/blender/modifiers/intern/MOD_decimate.c
View File

@@ -36,13 +36,11 @@
#include "math.h" #include "math.h"
#include "float.h" #include "float.h"
#include "BLI_kdtree.h" #include "BLI_math.h"
#include "BLI_rand.h"
#include "BLI_uvproject.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "DNA_armature_types.h" #include "DNA_meshdata_types.h"
#include "DNA_camera_types.h" #include "DNA_camera_types.h"
#include "DNA_curve_types.h" #include "DNA_curve_types.h"
#include "DNA_key_types.h" #include "DNA_key_types.h"
@@ -51,12 +49,9 @@
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"
#include "BKE_global.h"
#include "BKE_multires.h" #include "BKE_multires.h"
#include "BKE_key.h" #include "BKE_key.h"
#include "BKE_lattice.h" #include "BKE_lattice.h"
@@ -140,11 +135,8 @@ static DerivedMesh *applyModifier(
float *vbCo = &lod.vertex_buffer[a*3]; float *vbCo = &lod.vertex_buffer[a*3];
float *vbNo = &lod.vertex_normal_buffer[a*3]; float *vbNo = &lod.vertex_normal_buffer[a*3];
VECCOPY(vbCo, mv->co); copy_v3_v3(vbCo, mv->co);
normal_short_to_float_v3(vbNo, mv->no);
vbNo[0] = mv->no[0]/32767.0f;
vbNo[1] = mv->no[1]/32767.0f;
vbNo[2] = mv->no[2]/32767.0f;
} }
numTris = 0; numTris = 0;
@@ -184,7 +176,7 @@ static DerivedMesh *applyModifier(
MVert *mv = &mvert[a]; MVert *mv = &mvert[a];
float *vbCo = &lod.vertex_buffer[a*3]; float *vbCo = &lod.vertex_buffer[a*3];
VECCOPY(mv->co, vbCo); copy_v3_v3(mv->co, vbCo);
} }
if(lod.vertex_num>2) { if(lod.vertex_num>2) {

19
source/blender/modifiers/intern/MOD_displace.c
View File

@@ -38,12 +38,12 @@
#include "BLI_kdtree.h" #include "BLI_kdtree.h"
#include "BLI_rand.h" #include "BLI_rand.h"
#include "BLI_uvproject.h" #include "BLI_math.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "DNA_armature_types.h" #include "DNA_armature_types.h"
#include "DNA_camera_types.h" #include "DNA_meshdata_types.h"
#include "DNA_curve_types.h" #include "DNA_curve_types.h"
#include "DNA_key_types.h" #include "DNA_key_types.h"
#include "DNA_material_types.h" #include "DNA_material_types.h"
@@ -51,12 +51,9 @@
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"
#include "BKE_global.h"
#include "BKE_multires.h" #include "BKE_multires.h"
#include "BKE_key.h" #include "BKE_key.h"
#include "BKE_lattice.h" #include "BKE_lattice.h"
@@ -168,7 +165,7 @@ static int isDisabled(ModifierData *md, int useRenderParams)
} }
static void updateDepgraph( static void updateDepgraph(
ModifierData *md, DagForest *forest, Scene *scene, ModifierData *md, DagForest *forest, struct Scene *scene,
Object *ob, DagNode *obNode) Object *ob, DagNode *obNode)
{ {
DisplaceModifierData *dmd = (DisplaceModifierData*) md; DisplaceModifierData *dmd = (DisplaceModifierData*) md;
@@ -254,15 +251,13 @@ static void get_texture_coords(DisplaceModifierData *dmd, Object *ob,
for(i = 0; i < numVerts; ++i, ++co, ++texco) { for(i = 0; i < numVerts; ++i, ++co, ++texco) {
switch(texmapping) { switch(texmapping) {
case MOD_DISP_MAP_LOCAL: case MOD_DISP_MAP_LOCAL:
VECCOPY(*texco, *co); copy_v3_v3(*texco, *co);
break; break;
case MOD_DISP_MAP_GLOBAL: case MOD_DISP_MAP_GLOBAL:
VECCOPY(*texco, *co); mul_v3_m4v3(*texco, ob->obmat, *co);
mul_m4_v3(ob->obmat, *texco);
break; break;
case MOD_DISP_MAP_OBJECT: case MOD_DISP_MAP_OBJECT:
VECCOPY(*texco, *co); mul_v3_m4v3(*texco, ob->obmat, *co);
mul_m4_v3(ob->obmat, *texco);
mul_m4_v3(mapob_imat, *texco); mul_m4_v3(mapob_imat, *texco);
break; break;
} }
@@ -357,7 +352,7 @@ static void deformVerts(
} }
static void deformVertsEM( static void deformVertsEM(
ModifierData *md, Object *ob, EditMesh *editData, ModifierData *md, Object *ob, struct EditMesh *editData,
DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts)
{ {
DerivedMesh *dm= get_cddm(md->scene, ob, editData, derivedData, vertexCos); DerivedMesh *dm= get_cddm(md->scene, ob, editData, derivedData, vertexCos);

21
source/blender/modifiers/intern/MOD_edgesplit.c
View File

@@ -32,17 +32,17 @@
#include "stddef.h" #include "stddef.h"
#include "string.h" #include "string.h"
#include "stdarg.h"
#include "math.h" #include "math.h"
#include "float.h" #include "float.h"
#include "BLI_kdtree.h" #include "BLI_listbase.h"
#include "BLI_rand.h" #include "BLI_memarena.h"
#include "BLI_uvproject.h" #include "BLI_edgehash.h"
#include "BLI_math.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "DNA_armature_types.h" #include "DNA_meshdata_types.h"
#include "DNA_camera_types.h" #include "DNA_camera_types.h"
#include "DNA_curve_types.h" #include "DNA_curve_types.h"
#include "DNA_key_types.h" #include "DNA_key_types.h"
@@ -51,12 +51,9 @@
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"
#include "BKE_global.h"
#include "BKE_multires.h" #include "BKE_multires.h"
#include "BKE_key.h" #include "BKE_key.h"
#include "BKE_lattice.h" #include "BKE_lattice.h"
@@ -66,12 +63,6 @@
#include "BKE_object.h" #include "BKE_object.h"
#include "BKE_paint.h" #include "BKE_paint.h"
#include "BKE_particle.h" #include "BKE_particle.h"
#include "BKE_pointcache.h"
#include "BKE_scene.h"
#include "BKE_smoke.h"
#include "BKE_softbody.h"
#include "BKE_subsurf.h"
#include "BKE_texture.h"
#include "depsgraph_private.h" #include "depsgraph_private.h"
#include "BKE_deform.h" #include "BKE_deform.h"
@@ -1301,7 +1292,7 @@ static DerivedMesh *applyModifier(
} }
static DerivedMesh *applyModifierEM( static DerivedMesh *applyModifierEM(
ModifierData *md, Object *ob, EditMesh *editData, ModifierData *md, Object *ob, struct EditMesh *editData,
DerivedMesh *derivedData) DerivedMesh *derivedData)
{ {
return applyModifier(md, ob, derivedData, 0, 1); return applyModifier(md, ob, derivedData, 0, 1);

15
source/blender/modifiers/intern/MOD_explode.c
View File

@@ -38,12 +38,13 @@
#include "BLI_kdtree.h" #include "BLI_kdtree.h"
#include "BLI_rand.h" #include "BLI_rand.h"
#include "BLI_uvproject.h" #include "BLI_math.h"
#include "BLI_edgehash.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "DNA_armature_types.h" #include "DNA_meshdata_types.h"
#include "DNA_camera_types.h" #include "DNA_scene_types.h"
#include "DNA_curve_types.h" #include "DNA_curve_types.h"
#include "DNA_key_types.h" #include "DNA_key_types.h"
#include "DNA_material_types.h" #include "DNA_material_types.h"
@@ -51,12 +52,9 @@
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"
#include "BKE_global.h"
#include "BKE_multires.h" #include "BKE_multires.h"
#include "BKE_key.h" #include "BKE_key.h"
#include "BKE_lattice.h" #include "BKE_lattice.h"
@@ -72,6 +70,7 @@
#include "BKE_softbody.h" #include "BKE_softbody.h"
#include "BKE_subsurf.h" #include "BKE_subsurf.h"
#include "BKE_texture.h" #include "BKE_texture.h"
#include "BKE_utildefines.h"
#include "depsgraph_private.h" #include "depsgraph_private.h"
#include "BKE_deform.h" #include "BKE_deform.h"
@@ -362,8 +361,8 @@ static DerivedMesh * splitEdges(ExplodeModifierData *emd, DerivedMesh *dm){
mv=CDDM_get_vert(splitdm,i); mv=CDDM_get_vert(splitdm,i);
VECADD(dupve->co,dupve->co,mv->co); add_v3_v3(dupve->co, mv->co);
mul_v3_fl(dupve->co,0.5); mul_v3_fl(dupve->co, 0.5f);
} }
BLI_edgehashIterator_free(ehi); BLI_edgehashIterator_free(ehi);

10
source/blender/modifiers/intern/MOD_fluidsim.c
View File

@@ -42,21 +42,15 @@
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "DNA_armature_types.h" #include "DNA_scene_types.h"
#include "DNA_camera_types.h" #include "DNA_meshdata_types.h"
#include "DNA_curve_types.h"
#include "DNA_key_types.h"
#include "DNA_material_types.h"
#include "DNA_object_fluidsim.h" #include "DNA_object_fluidsim.h"
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"
#include "BKE_global.h"
#include "BKE_multires.h" #include "BKE_multires.h"
#include "BKE_key.h" #include "BKE_key.h"
#include "BKE_lattice.h" #include "BKE_lattice.h"

81
source/blender/modifiers/intern/MOD_fluidsim_util.c
View File

@@ -32,10 +32,17 @@
#include "stddef.h" #include "stddef.h"
#include "string.h" #include "string.h"
#include "stdarg.h"
#include "math.h" #include "math.h"
#include "float.h" #include "float.h"
#include "BKE_DerivedMesh.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "MOD_modifiertypes.h"
#include "MOD_fluidsim_util.h"
// headers for fluidsim bobj meshes // headers for fluidsim bobj meshes
#include <stdlib.h> #include <stdlib.h>
#include "LBM_fluidsim.h" #include "LBM_fluidsim.h"
@@ -43,78 +50,6 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include "BLI_kdtree.h"
#include "BLI_rand.h"
#include "BLI_uvproject.h"
#include "MEM_guardedalloc.h"
#include "DNA_armature_types.h"
#include "DNA_camera_types.h"
#include "DNA_curve_types.h"
#include "DNA_key_types.h"
#include "DNA_material_types.h"
#include "DNA_object_fluidsim.h"
#include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_displist.h"
#include "BKE_fluidsim.h"
#include "BKE_global.h"
#include "BKE_multires.h"
#include "BKE_key.h"
#include "BKE_lattice.h"
#include "BKE_material.h"
#include "BKE_mesh.h"
#include "BKE_modifier.h"
#include "BKE_object.h"
#include "BKE_paint.h"
#include "BKE_particle.h"
#include "BKE_pointcache.h"
#include "BKE_scene.h"
#include "BKE_smoke.h"
#include "BKE_softbody.h"
#include "BKE_subsurf.h"
#include "BKE_texture.h"
#include "depsgraph_private.h"
#include "BKE_deform.h"
#include "BKE_shrinkwrap.h"
#include "MOD_modifiertypes.h"
#include "MOD_fluidsim_util.h"
#include "BLI_storage.h" /* _LARGEFILE_SOURCE */
#include "MEM_guardedalloc.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_fluidsim.h"
#include "DNA_object_force.h" // for pointcache
#include "DNA_object_types.h"
#include "DNA_particle_types.h"
#include "DNA_scene_types.h" // N_T
#include "BLI_math.h"
#include "BLI_blenlib.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_customdata.h"
#include "BKE_DerivedMesh.h"
#include "BKE_fluidsim.h"
#include "BKE_global.h"
#include "BKE_modifier.h"
#include "BKE_mesh.h"
#include "BKE_pointcache.h"
#include "BKE_utildefines.h"
#include "BLO_sys_types.h"
void fluidsim_init(FluidsimModifierData *fluidmd) void fluidsim_init(FluidsimModifierData *fluidmd)
{ {
#ifndef DISABLE_ELBEEM #ifndef DISABLE_ELBEEM

14
source/blender/modifiers/intern/MOD_hook.c
View File

@@ -38,12 +38,13 @@
#include "BLI_kdtree.h" #include "BLI_kdtree.h"
#include "BLI_rand.h" #include "BLI_rand.h"
#include "BLI_uvproject.h" #include "BLI_math.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "DNA_armature_types.h" #include "DNA_armature_types.h"
#include "DNA_camera_types.h" #include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_curve_types.h" #include "DNA_curve_types.h"
#include "DNA_key_types.h" #include "DNA_key_types.h"
#include "DNA_material_types.h" #include "DNA_material_types.h"
@@ -51,12 +52,9 @@
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"
#include "BKE_global.h"
#include "BKE_multires.h" #include "BKE_multires.h"
#include "BKE_key.h" #include "BKE_key.h"
#include "BKE_lattice.h" #include "BKE_lattice.h"
@@ -98,7 +96,7 @@ static void copyData(ModifierData *md, ModifierData *target)
HookModifierData *hmd = (HookModifierData*) md; HookModifierData *hmd = (HookModifierData*) md;
HookModifierData *thmd = (HookModifierData*) target; HookModifierData *thmd = (HookModifierData*) target;
VECCOPY(thmd->cent, hmd->cent); copy_v3_v3(thmd->cent, hmd->cent);
thmd->falloff = hmd->falloff; thmd->falloff = hmd->falloff;
thmd->force = hmd->force; thmd->force = hmd->force;
thmd->object = hmd->object; thmd->object = hmd->object;
@@ -144,7 +142,7 @@ static void foreachObjectLink(
walk(userData, ob, &hmd->object); walk(userData, ob, &hmd->object);
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, Scene *scene, static void updateDepgraph(ModifierData *md, DagForest *forest, struct Scene *scene,
Object *ob, DagNode *obNode) Object *ob, DagNode *obNode)
{ {
HookModifierData *hmd = (HookModifierData*) md; HookModifierData *hmd = (HookModifierData*) md;
@@ -282,7 +280,7 @@ static void deformVerts(
} }
static void deformVertsEM( static void deformVertsEM(
ModifierData *md, Object *ob, EditMesh *editData, ModifierData *md, Object *ob, struct EditMesh *editData,
DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts)
{ {
DerivedMesh *dm = derivedData; DerivedMesh *dm = derivedData;

7
source/blender/modifiers/intern/MOD_lattice.c
View File

@@ -51,12 +51,9 @@
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"
#include "BKE_global.h"
#include "BKE_multires.h" #include "BKE_multires.h"
#include "BKE_key.h" #include "BKE_key.h"
#include "BKE_lattice.h" #include "BKE_lattice.h"
@@ -124,7 +121,7 @@ static void foreachObjectLink(
walk(userData, ob, &lmd->object); walk(userData, ob, &lmd->object);
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, Scene *scene, static void updateDepgraph(ModifierData *md, DagForest *forest, struct Scene *scene,
Object *ob, DagNode *obNode) Object *ob, DagNode *obNode)
{ {
LatticeModifierData *lmd = (LatticeModifierData*) md; LatticeModifierData *lmd = (LatticeModifierData*) md;
@@ -151,7 +148,7 @@ static void deformVerts(
} }
static void deformVertsEM( static void deformVertsEM(
ModifierData *md, Object *ob, EditMesh *editData, ModifierData *md, Object *ob, struct EditMesh *editData,
DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts)
{ {
DerivedMesh *dm = derivedData; DerivedMesh *dm = derivedData;

11
source/blender/modifiers/intern/MOD_mask.c
View File

@@ -36,14 +36,12 @@
#include "math.h" #include "math.h"
#include "float.h" #include "float.h"
#include "BLI_kdtree.h" #include "BLI_ghash.h"
#include "BLI_rand.h"
#include "BLI_uvproject.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "DNA_armature_types.h" #include "DNA_armature_types.h"
#include "DNA_camera_types.h" #include "DNA_meshdata_types.h"
#include "DNA_curve_types.h" #include "DNA_curve_types.h"
#include "DNA_key_types.h" #include "DNA_key_types.h"
#include "DNA_material_types.h" #include "DNA_material_types.h"
@@ -51,12 +49,9 @@
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"
#include "BKE_global.h"
#include "BKE_multires.h" #include "BKE_multires.h"
#include "BKE_key.h" #include "BKE_key.h"
#include "BKE_lattice.h" #include "BKE_lattice.h"
@@ -108,7 +103,7 @@ static void foreachObjectLink(
walk(userData, ob, &mmd->ob_arm); walk(userData, ob, &mmd->ob_arm);
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, Scene *scene, static void updateDepgraph(ModifierData *md, DagForest *forest, struct Scene *scene,
Object *ob, DagNode *obNode) Object *ob, DagNode *obNode)
{ {
MaskModifierData *mmd = (MaskModifierData *)md; MaskModifierData *mmd = (MaskModifierData *)md;

35
source/blender/modifiers/intern/MOD_meshdeform.c
View File

@@ -38,11 +38,11 @@
#include "BLI_kdtree.h" #include "BLI_kdtree.h"
#include "BLI_rand.h" #include "BLI_rand.h"
#include "BLI_uvproject.h" #include "BLI_math.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "DNA_armature_types.h" #include "DNA_meshdata_types.h"
#include "DNA_camera_types.h" #include "DNA_camera_types.h"
#include "DNA_curve_types.h" #include "DNA_curve_types.h"
#include "DNA_key_types.h" #include "DNA_key_types.h"
@@ -51,8 +51,6 @@
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"
@@ -143,7 +141,7 @@ static void foreachObjectLink(
} }
static void updateDepgraph( static void updateDepgraph(
ModifierData *md, DagForest *forest, Scene *scene, Object *ob, ModifierData *md, DagForest *forest, struct Scene *scene, Object *ob,
DagNode *obNode) DagNode *obNode)
{ {
MeshDeformModifierData *mmd = (MeshDeformModifierData*) md; MeshDeformModifierData *mmd = (MeshDeformModifierData*) md;
@@ -204,7 +202,7 @@ static float meshdeform_dynamic_bind(MeshDeformModifierData *mmd, float (*dco)[3
} }
} }
VECCOPY(vec, co); copy_v3_v3(vec, co);
return totweight; return totweight;
} }
@@ -214,8 +212,8 @@ static void meshdeformModifier_do(
float (*vertexCos)[3], int numVerts) float (*vertexCos)[3], int numVerts)
{ {
MeshDeformModifierData *mmd = (MeshDeformModifierData*) md; MeshDeformModifierData *mmd = (MeshDeformModifierData*) md;
Mesh *me= (mmd->object)? mmd->object->data: NULL; struct Mesh *me= (mmd->object)? mmd->object->data: NULL;
EditMesh *em = (me)? BKE_mesh_get_editmesh(me): NULL; struct EditMesh *em = (me)? BKE_mesh_get_editmesh(me): NULL;
DerivedMesh *tmpdm, *cagedm; DerivedMesh *tmpdm, *cagedm;
MDeformVert *dvert = NULL; MDeformVert *dvert = NULL;
MDeformWeight *dw; MDeformWeight *dw;
@@ -284,15 +282,15 @@ static void meshdeformModifier_do(
dco= MEM_callocN(sizeof(*dco)*totcagevert, "MDefDco"); dco= MEM_callocN(sizeof(*dco)*totcagevert, "MDefDco");
for(a=0; a<totcagevert; a++) { for(a=0; a<totcagevert; a++) {
/* get cage vertex in world space with binding transform */ /* get cage vertex in world space with binding transform */
VECCOPY(co, cagemvert[a].co); copy_v3_v3(co, cagemvert[a].co);
if(G.rt != 527) { if(G.rt != 527) {
mul_m4_v3(mmd->bindmat, co); mul_m4_v3(mmd->bindmat, co);
/* compute difference with world space bind coord */ /* compute difference with world space bind coord */
VECSUB(dco[a], co, bindcos[a]); sub_v3_v3v3(dco[a], co, bindcos[a]);
} }
else else
VECCOPY(dco[a], co) copy_v3_v3(dco[a], co);
} }
defgrp_index = defgroup_name_index(ob, mmd->defgrp_name); defgrp_index = defgroup_name_index(ob, mmd->defgrp_name);
@@ -329,8 +327,7 @@ static void meshdeformModifier_do(
if(mmd->flag & MOD_MDEF_DYNAMIC_BIND) { if(mmd->flag & MOD_MDEF_DYNAMIC_BIND) {
/* transform coordinate into cage's local space */ /* transform coordinate into cage's local space */
VECCOPY(co, vertexCos[b]); mul_v3_m4v3(co, cagemat, vertexCos[b]);
mul_m4_v3(cagemat, co);
totweight= meshdeform_dynamic_bind(mmd, dco, co); totweight= meshdeform_dynamic_bind(mmd, dco, co);
} }
else { else {
@@ -339,9 +336,7 @@ static void meshdeformModifier_do(
for(a=0; a<totcagevert; a++) { for(a=0; a<totcagevert; a++) {
weight= weights[a + b*totcagevert]; weight= weights[a + b*totcagevert];
co[0]+= weight*dco[a][0]; madd_v3_v3fl(co, dco[a], weight);
co[1]+= weight*dco[a][1];
co[2]+= weight*dco[a][2];
totweight += weight; totweight += weight;
} }
} }
@@ -350,9 +345,9 @@ static void meshdeformModifier_do(
mul_v3_fl(co, fac/totweight); mul_v3_fl(co, fac/totweight);
mul_m3_v3(icagemat, co); mul_m3_v3(icagemat, co);
if(G.rt != 527) if(G.rt != 527)
VECADD(vertexCos[b], vertexCos[b], co) add_v3_v3(vertexCos[b], co);
else else
VECCOPY(vertexCos[b], co) copy_v3_v3(vertexCos[b], co);
} }
} }
@@ -379,7 +374,7 @@ static void deformVerts(
} }
static void deformVertsEM( static void deformVertsEM(
ModifierData *md, Object *ob, EditMesh *editData, ModifierData *md, Object *ob, struct EditMesh *editData,
DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts)
{ {
DerivedMesh *dm; DerivedMesh *dm;

20
source/blender/modifiers/intern/MOD_mirror.c
View File

@@ -36,13 +36,11 @@
#include "math.h" #include "math.h"
#include "float.h" #include "float.h"
#include "BLI_kdtree.h" #include "BLI_math.h"
#include "BLI_rand.h"
#include "BLI_uvproject.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "DNA_armature_types.h" #include "DNA_meshdata_types.h"
#include "DNA_camera_types.h" #include "DNA_camera_types.h"
#include "DNA_curve_types.h" #include "DNA_curve_types.h"
#include "DNA_key_types.h" #include "DNA_key_types.h"
@@ -51,12 +49,9 @@
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"
#include "BKE_global.h"
#include "BKE_multires.h" #include "BKE_multires.h"
#include "BKE_key.h" #include "BKE_key.h"
#include "BKE_lattice.h" #include "BKE_lattice.h"
@@ -76,6 +71,7 @@
#include "depsgraph_private.h" #include "depsgraph_private.h"
#include "BKE_deform.h" #include "BKE_deform.h"
#include "BKE_shrinkwrap.h" #include "BKE_shrinkwrap.h"
#include "BKE_utildefines.h"
#include "LOD_decimation.h" #include "LOD_decimation.h"
@@ -116,7 +112,7 @@ static void foreachObjectLink(
walk(userData, ob, &mmd->mirror_ob); walk(userData, ob, &mmd->mirror_ob);
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, Scene *scene, static void updateDepgraph(ModifierData *md, DagForest *forest, struct Scene *scene,
Object *ob, DagNode *obNode) Object *ob, DagNode *obNode)
{ {
MirrorModifierData *mmd = (MirrorModifierData*) md; MirrorModifierData *mmd = (MirrorModifierData*) md;
@@ -179,7 +175,7 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
copy_v3_v3(co, inMV.co); copy_v3_v3(co, inMV.co);
if (mmd->mirror_ob) { if (mmd->mirror_ob) {
mul_v3_m4v3(co, mtx, co); mul_m4_v3(mtx, co);
} }
isShared = ABS(co[axis])<=tolerance; isShared = ABS(co[axis])<=tolerance;
@@ -197,7 +193,7 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
if(isShared) { if(isShared) {
co[axis] = 0; co[axis] = 0;
if (mmd->mirror_ob) { if (mmd->mirror_ob) {
mul_v3_m4v3(co, imtx, co); mul_m4_v3(imtx, co);
} }
copy_v3_v3(mv->co, co); copy_v3_v3(mv->co, co);
@@ -210,7 +206,7 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
co[axis] = -co[axis]; co[axis] = -co[axis];
if (mmd->mirror_ob) { if (mmd->mirror_ob) {
mul_v3_m4v3(co, imtx, co); mul_m4_v3(imtx, co);
} }
copy_v3_v3(mv2->co, co); copy_v3_v3(mv2->co, co);
@@ -356,7 +352,7 @@ static DerivedMesh *applyModifier(
} }
static DerivedMesh *applyModifierEM( static DerivedMesh *applyModifierEM(
ModifierData *md, Object *ob, EditMesh *editData, ModifierData *md, Object *ob, struct EditMesh *editData,
DerivedMesh *derivedData) DerivedMesh *derivedData)
{ {
return applyModifier(md, ob, derivedData, 0, 1); return applyModifier(md, ob, derivedData, 0, 1);

3
source/blender/modifiers/intern/MOD_multires.c
View File

@@ -51,12 +51,9 @@
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"
#include "BKE_global.h"
#include "BKE_multires.h" #include "BKE_multires.h"
#include "BKE_key.h" #include "BKE_key.h"
#include "BKE_lattice.h" #include "BKE_lattice.h"

23
source/blender/modifiers/intern/MOD_particleinstance.c
View File

@@ -36,27 +36,18 @@
#include "math.h" #include "math.h"
#include "float.h" #include "float.h"
#include "BLI_kdtree.h" #include "BLI_math.h"
#include "BLI_listbase.h"
#include "BLI_rand.h" #include "BLI_rand.h"
#include "BLI_uvproject.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "DNA_armature_types.h" #include "DNA_meshdata_types.h"
#include "DNA_camera_types.h"
#include "DNA_curve_types.h"
#include "DNA_key_types.h"
#include "DNA_material_types.h"
#include "DNA_object_fluidsim.h"
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"
#include "BKE_global.h"
#include "BKE_multires.h" #include "BKE_multires.h"
#include "BKE_key.h" #include "BKE_key.h"
#include "BKE_lattice.h" #include "BKE_lattice.h"
@@ -76,6 +67,8 @@
#include "depsgraph_private.h" #include "depsgraph_private.h"
#include "BKE_deform.h" #include "BKE_deform.h"
#include "BKE_shrinkwrap.h" #include "BKE_shrinkwrap.h"
#include "BKE_utildefines.h"
#include "MOD_modifiertypes.h" #include "MOD_modifiertypes.h"
@@ -109,7 +102,7 @@ static int dependsOnTime(ModifierData *md)
return 0; return 0;
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, DagForest *forest,
Scene *scene,Object *ob, DagNode *obNode) struct Scene *scene,Object *ob, DagNode *obNode)
{ {
ParticleInstanceModifierData *pimd = (ParticleInstanceModifierData*) md; ParticleInstanceModifierData *pimd = (ParticleInstanceModifierData*) md;
@@ -229,7 +222,7 @@ static DerivedMesh * applyModifier(
*mv = *inMV; *mv = *inMV;
/*change orientation based on object trackflag*/ /*change orientation based on object trackflag*/
VECCOPY(temp_co,mv->co); copy_v3_v3(temp_co, mv->co);
mv->co[axis]=temp_co[track]; mv->co[axis]=temp_co[track];
mv->co[(axis+1)%3]=temp_co[(track+1)%3]; mv->co[(axis+1)%3]=temp_co[(track+1)%3];
mv->co[(axis+2)%3]=temp_co[(track+2)%3]; mv->co[(axis+2)%3]=temp_co[(track+2)%3];
@@ -339,7 +332,7 @@ static DerivedMesh * applyModifier(
return result; return result;
} }
static DerivedMesh *applyModifierEM( static DerivedMesh *applyModifierEM(
ModifierData *md, Object *ob, EditMesh *editData, ModifierData *md, Object *ob, struct EditMesh *editData,
DerivedMesh *derivedData) DerivedMesh *derivedData)
{ {
return applyModifier(md, ob, derivedData, 0, 1); return applyModifier(md, ob, derivedData, 0, 1);

5
source/blender/modifiers/intern/MOD_particlesystem.c
View File

@@ -32,7 +32,6 @@
#include "stddef.h" #include "stddef.h"
#include "string.h" #include "string.h"
#include "stdarg.h"
#include "math.h" #include "math.h"
#include "float.h" #include "float.h"
@@ -51,12 +50,9 @@
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"
#include "BKE_global.h"
#include "BKE_multires.h" #include "BKE_multires.h"
#include "BKE_key.h" #include "BKE_key.h"
#include "BKE_lattice.h" #include "BKE_lattice.h"
@@ -73,7 +69,6 @@
#include "BKE_subsurf.h" #include "BKE_subsurf.h"
#include "BKE_texture.h" #include "BKE_texture.h"
#include "depsgraph_private.h"
#include "BKE_deform.h" #include "BKE_deform.h"
#include "RE_shader_ext.h" #include "RE_shader_ext.h"

21
source/blender/modifiers/intern/MOD_screw.c
View File

@@ -32,39 +32,28 @@
#include "stddef.h" #include "stddef.h"
#include "string.h" #include "string.h"
#include "stdarg.h"
#include "math.h" #include "math.h"
#include "float.h" #include "float.h"
#include "BLI_kdtree.h" #include "BLI_kdtree.h"
#include "BLI_rand.h" #include "BLI_rand.h"
#include "BLI_uvproject.h" #include "BLI_math.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "DNA_armature_types.h" #include "DNA_meshdata_types.h"
#include "DNA_camera_types.h" #include "DNA_camera_types.h"
#include "DNA_curve_types.h" #include "DNA_curve_types.h"
#include "DNA_key_types.h" #include "DNA_key_types.h"
#include "DNA_material_types.h" #include "DNA_material_types.h"
#include "DNA_object_fluidsim.h" #include "DNA_object_fluidsim.h"
#include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h"
#include "BKE_fluidsim.h"
#include "BKE_global.h"
#include "BKE_multires.h"
#include "BKE_key.h" #include "BKE_key.h"
#include "BKE_lattice.h"
#include "BKE_material.h" #include "BKE_material.h"
#include "BKE_mesh.h" #include "BKE_mesh.h"
#include "BKE_modifier.h" #include "BKE_modifier.h"
#include "BKE_object.h" #include "BKE_object.h"
#include "BKE_paint.h"
#include "BKE_particle.h" #include "BKE_particle.h"
#include "BKE_pointcache.h" #include "BKE_pointcache.h"
#include "BKE_scene.h" #include "BKE_scene.h"
@@ -75,11 +64,9 @@
#include "depsgraph_private.h" #include "depsgraph_private.h"
#include "BKE_deform.h" #include "BKE_deform.h"
#include "BKE_shrinkwrap.h"
#include "LOD_decimation.h" #include "LOD_decimation.h"
#include "CCGSubSurf.h"
#include "RE_shader_ext.h" #include "RE_shader_ext.h"
@@ -859,7 +846,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
static void updateDepgraph( static void updateDepgraph(
ModifierData *md, DagForest *forest, ModifierData *md, DagForest *forest,
Scene *scene, Object *ob, DagNode *obNode) struct Scene *scene, Object *ob, DagNode *obNode)
{ {
ScrewModifierData *ltmd= (ScrewModifierData*) md; ScrewModifierData *ltmd= (ScrewModifierData*) md;
@@ -884,7 +871,7 @@ static void foreachObjectLink(
/* This dosnt work with material*/ /* This dosnt work with material*/
static DerivedMesh *applyModifierEM( static DerivedMesh *applyModifierEM(
ModifierData *md, Object *ob, EditMesh *editData, ModifierData *md, Object *ob, struct EditMesh *editData,
DerivedMesh *derivedData) DerivedMesh *derivedData)
{ {
return applyModifier(md, ob, derivedData, 0, 1); return applyModifier(md, ob, derivedData, 0, 1);

12
source/blender/modifiers/intern/MOD_shapekey.c
View File

@@ -32,13 +32,12 @@
#include "stddef.h" #include "stddef.h"
#include "string.h" #include "string.h"
#include "stdarg.h"
#include "math.h" #include "math.h"
#include "float.h" #include "float.h"
#include "BLI_kdtree.h" #include "BLI_kdtree.h"
#include "BLI_rand.h" #include "BLI_rand.h"
#include "BLI_uvproject.h" #include "BLI_math.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
@@ -51,12 +50,9 @@
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"
#include "BKE_global.h"
#include "BKE_multires.h" #include "BKE_multires.h"
#include "BKE_key.h" #include "BKE_key.h"
#include "BKE_lattice.h" #include "BKE_lattice.h"
@@ -73,13 +69,11 @@
#include "BKE_subsurf.h" #include "BKE_subsurf.h"
#include "BKE_texture.h" #include "BKE_texture.h"
#include "depsgraph_private.h"
#include "BKE_deform.h" #include "BKE_deform.h"
#include "BKE_shrinkwrap.h" #include "BKE_shrinkwrap.h"
#include "LOD_decimation.h" #include "LOD_decimation.h"
#include "CCGSubSurf.h"
#include "RE_shader_ext.h" #include "RE_shader_ext.h"
@@ -103,7 +97,7 @@ static void deformVerts(
} }
static void deformVertsEM( static void deformVertsEM(
ModifierData *md, Object *ob, EditMesh *editData, ModifierData *md, Object *ob, struct EditMesh *editData,
DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts)
{ {
Key *key= ob_get_key(ob); Key *key= ob_get_key(ob);
@@ -113,7 +107,7 @@ static void deformVertsEM(
} }
static void deformMatricesEM( static void deformMatricesEM(
ModifierData *md, Object *ob, EditMesh *editData, ModifierData *md, Object *ob, struct EditMesh *editData,
DerivedMesh *derivedData, float (*vertexCos)[3], DerivedMesh *derivedData, float (*vertexCos)[3],
float (*defMats)[3][3], int numVerts) float (*defMats)[3][3], int numVerts)
{ {

9
source/blender/modifiers/intern/MOD_shrinkwrap.c
View File

@@ -32,7 +32,6 @@
#include "stddef.h" #include "stddef.h"
#include "string.h" #include "string.h"
#include "stdarg.h"
#include "math.h" #include "math.h"
#include "float.h" #include "float.h"
@@ -51,12 +50,9 @@
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"
#include "BKE_global.h"
#include "BKE_multires.h" #include "BKE_multires.h"
#include "BKE_key.h" #include "BKE_key.h"
#include "BKE_lattice.h" #include "BKE_lattice.h"
@@ -79,7 +75,6 @@
#include "LOD_decimation.h" #include "LOD_decimation.h"
#include "CCGSubSurf.h"
#include "RE_shader_ext.h" #include "RE_shader_ext.h"
@@ -163,7 +158,7 @@ static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData,
dm->release(dm); dm->release(dm);
} }
static void deformVertsEM(ModifierData *md, Object *ob, EditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) static void deformVertsEM(ModifierData *md, Object *ob, struct EditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts)
{ {
DerivedMesh *dm = derivedData; DerivedMesh *dm = derivedData;
CustomDataMask dataMask = requiredDataMask(ob, md); CustomDataMask dataMask = requiredDataMask(ob, md);
@@ -178,7 +173,7 @@ static void deformVertsEM(ModifierData *md, Object *ob, EditMesh *editData, Deri
dm->release(dm); dm->release(dm);
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, Scene *scene, Object *ob, DagNode *obNode) static void updateDepgraph(ModifierData *md, DagForest *forest, struct Scene *scene, Object *ob, DagNode *obNode)
{ {
ShrinkwrapModifierData *smd = (ShrinkwrapModifierData*) md; ShrinkwrapModifierData *smd = (ShrinkwrapModifierData*) md;

8
source/blender/modifiers/intern/MOD_simpledeform.c
View File

@@ -32,7 +32,6 @@
#include "stddef.h" #include "stddef.h"
#include "string.h" #include "string.h"
#include "stdarg.h"
#include "math.h" #include "math.h"
#include "float.h" #include "float.h"
@@ -51,12 +50,9 @@
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"
#include "BKE_global.h"
#include "BKE_multires.h" #include "BKE_multires.h"
#include "BKE_key.h" #include "BKE_key.h"
#include "BKE_lattice.h" #include "BKE_lattice.h"
@@ -354,7 +350,7 @@ static void foreachObjectLink(ModifierData *md, Object *ob, void (*walk)(void *u
walk(userData, ob, &smd->origin); walk(userData, ob, &smd->origin);
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, Scene *scene, Object *ob, DagNode *obNode) static void updateDepgraph(ModifierData *md, DagForest *forest, struct Scene *scene, Object *ob, DagNode *obNode)
{ {
SimpleDeformModifierData *smd = (SimpleDeformModifierData*)md; SimpleDeformModifierData *smd = (SimpleDeformModifierData*)md;
@@ -378,7 +374,7 @@ static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData,
dm->release(dm); dm->release(dm);
} }
static void deformVertsEM(ModifierData *md, Object *ob, EditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) static void deformVertsEM(ModifierData *md, Object *ob, struct EditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts)
{ {
DerivedMesh *dm = derivedData; DerivedMesh *dm = derivedData;
CustomDataMask dataMask = requiredDataMask(ob, md); CustomDataMask dataMask = requiredDataMask(ob, md);

7
source/blender/modifiers/intern/MOD_smoke.c
View File

@@ -32,7 +32,6 @@
#include "stddef.h" #include "stddef.h"
#include "string.h" #include "string.h"
#include "stdarg.h"
#include "math.h" #include "math.h"
#include "float.h" #include "float.h"
@@ -51,12 +50,9 @@
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"
#include "BKE_global.h"
#include "BKE_multires.h" #include "BKE_multires.h"
#include "BKE_key.h" #include "BKE_key.h"
#include "BKE_lattice.h" #include "BKE_lattice.h"
@@ -79,7 +75,6 @@
#include "LOD_decimation.h" #include "LOD_decimation.h"
#include "CCGSubSurf.h"
#include "RE_shader_ext.h" #include "RE_shader_ext.h"
@@ -124,7 +119,7 @@ static int dependsOnTime(ModifierData *md)
} }
static void updateDepgraph( static void updateDepgraph(
ModifierData *md, DagForest *forest, Scene *scene, Object *ob, ModifierData *md, DagForest *forest, struct Scene *scene, Object *ob,
DagNode *obNode) DagNode *obNode)
{ {
/*SmokeModifierData *smd = (SmokeModifierData *) md; /*SmokeModifierData *smd = (SmokeModifierData *) md;

12
source/blender/modifiers/intern/MOD_smooth.c
View File

@@ -32,17 +32,16 @@
#include "stddef.h" #include "stddef.h"
#include "string.h" #include "string.h"
#include "stdarg.h"
#include "math.h" #include "math.h"
#include "float.h" #include "float.h"
#include "BLI_kdtree.h" #include "BLI_kdtree.h"
#include "BLI_rand.h" #include "BLI_rand.h"
#include "BLI_uvproject.h" #include "BLI_math.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "DNA_armature_types.h" #include "DNA_meshdata_types.h"
#include "DNA_camera_types.h" #include "DNA_camera_types.h"
#include "DNA_curve_types.h" #include "DNA_curve_types.h"
#include "DNA_key_types.h" #include "DNA_key_types.h"
@@ -51,12 +50,9 @@
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"
#include "BKE_global.h"
#include "BKE_multires.h" #include "BKE_multires.h"
#include "BKE_key.h" #include "BKE_key.h"
#include "BKE_lattice.h" #include "BKE_lattice.h"
@@ -73,13 +69,11 @@
#include "BKE_subsurf.h" #include "BKE_subsurf.h"
#include "BKE_texture.h" #include "BKE_texture.h"
#include "depsgraph_private.h"
#include "BKE_deform.h" #include "BKE_deform.h"
#include "BKE_shrinkwrap.h" #include "BKE_shrinkwrap.h"
#include "LOD_decimation.h" #include "LOD_decimation.h"
#include "CCGSubSurf.h"
#include "RE_shader_ext.h" #include "RE_shader_ext.h"
@@ -274,7 +268,7 @@ static void deformVerts(
} }
static void deformVertsEM( static void deformVertsEM(
ModifierData *md, Object *ob, EditMesh *editData, ModifierData *md, Object *ob, struct EditMesh *editData,
DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts)
{ {
DerivedMesh *dm= get_dm(md->scene, ob, editData, derivedData, NULL, 0); DerivedMesh *dm= get_dm(md->scene, ob, editData, derivedData, NULL, 0);

8
source/blender/modifiers/intern/MOD_softbody.c
View File

@@ -32,7 +32,6 @@
#include "stddef.h" #include "stddef.h"
#include "string.h" #include "string.h"
#include "stdarg.h"
#include "math.h" #include "math.h"
#include "float.h" #include "float.h"
@@ -42,7 +41,7 @@
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "DNA_armature_types.h" #include "DNA_scene_types.h"
#include "DNA_camera_types.h" #include "DNA_camera_types.h"
#include "DNA_curve_types.h" #include "DNA_curve_types.h"
#include "DNA_key_types.h" #include "DNA_key_types.h"
@@ -51,12 +50,9 @@
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"
#include "BKE_global.h"
#include "BKE_multires.h" #include "BKE_multires.h"
#include "BKE_key.h" #include "BKE_key.h"
#include "BKE_lattice.h" #include "BKE_lattice.h"
@@ -73,13 +69,11 @@
#include "BKE_subsurf.h" #include "BKE_subsurf.h"
#include "BKE_texture.h" #include "BKE_texture.h"
#include "depsgraph_private.h"
#include "BKE_deform.h" #include "BKE_deform.h"
#include "BKE_shrinkwrap.h" #include "BKE_shrinkwrap.h"
#include "LOD_decimation.h" #include "LOD_decimation.h"
#include "CCGSubSurf.h"
#include "RE_shader_ext.h" #include "RE_shader_ext.h"

27
source/blender/modifiers/intern/MOD_solidify.c
View File

@@ -32,31 +32,21 @@
#include "stddef.h" #include "stddef.h"
#include "string.h" #include "string.h"
#include "stdarg.h"
#include "math.h" #include "math.h"
#include "float.h" #include "float.h"
#include "BLI_kdtree.h" #include "BLI_math.h"
#include "BLI_rand.h" #include "BLI_edgehash.h"
#include "BLI_uvproject.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "DNA_armature_types.h" #include "DNA_meshdata_types.h"
#include "DNA_camera_types.h"
#include "DNA_curve_types.h"
#include "DNA_key_types.h"
#include "DNA_material_types.h"
#include "DNA_object_fluidsim.h"
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"
#include "BKE_fluidsim.h" #include "BKE_fluidsim.h"
#include "BKE_global.h"
#include "BKE_multires.h" #include "BKE_multires.h"
#include "BKE_key.h" #include "BKE_key.h"
#include "BKE_lattice.h" #include "BKE_lattice.h"
@@ -73,15 +63,13 @@
#include "BKE_subsurf.h" #include "BKE_subsurf.h"
#include "BKE_texture.h" #include "BKE_texture.h"
#include "depsgraph_private.h"
#include "BKE_deform.h" #include "BKE_deform.h"
#include "BKE_shrinkwrap.h"
#include "BKE_utildefines.h"
#include "LOD_decimation.h" #include "LOD_decimation.h"
#include "CCGSubSurf.h"
#include "RE_shader_ext.h"
#include "MOD_modifiertypes.h" #include "MOD_modifiertypes.h"
@@ -181,8 +169,7 @@ static void dm_calc_normal(DerivedMesh *dm, float (*temp_nors)[3])
/* only one face attached to that edge */ /* only one face attached to that edge */
/* an edge without another attached- the weight on this is /* an edge without another attached- the weight on this is
* undefined, M_PI/2 is 90d in radians and that seems good enough */ * undefined, M_PI/2 is 90d in radians and that seems good enough */
VECCOPY(edge_normal, face_nors[edge_ref->f1]) mul_v3_v3fl(edge_normal, face_nors[edge_ref->f1], M_PI/2);
mul_v3_fl(edge_normal, M_PI/2);
} }
add_v3_v3(temp_nors[ed_v1], edge_normal); add_v3_v3(temp_nors[ed_v1], edge_normal);
add_v3_v3(temp_nors[ed_v2], edge_normal); add_v3_v3(temp_nors[ed_v2], edge_normal);
@@ -655,7 +642,7 @@ static DerivedMesh *applyModifier(ModifierData *md,
static DerivedMesh *applyModifierEM(ModifierData *md, static DerivedMesh *applyModifierEM(ModifierData *md,
Object *ob, Object *ob,
EditMesh *editData, struct EditMesh *editData,
DerivedMesh *derivedData) DerivedMesh *derivedData)
{ {
return applyModifier(md, ob, derivedData, 0, 1); return applyModifier(md, ob, derivedData, 0, 1);

44
source/blender/modifiers/intern/MOD_subsurf.c
View File

@@ -32,54 +32,20 @@
#include "stddef.h" #include "stddef.h"
#include "string.h" #include "string.h"
#include "stdarg.h"
#include "math.h" #include "math.h"
#include "float.h" #include "float.h"
#include "BLI_kdtree.h" #include "DNA_scene_types.h"
#include "BLI_rand.h" #include "DNA_object_types.h"
#include "BLI_uvproject.h" #include "DNA_meshdata_types.h"
#include "MEM_guardedalloc.h"
#include "DNA_armature_types.h"
#include "DNA_camera_types.h"
#include "DNA_curve_types.h"
#include "DNA_key_types.h"
#include "DNA_material_types.h"
#include "DNA_object_fluidsim.h"
#include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h"
#include "BKE_fluidsim.h"
#include "BKE_global.h"
#include "BKE_multires.h"
#include "BKE_key.h"
#include "BKE_lattice.h"
#include "BKE_material.h"
#include "BKE_mesh.h"
#include "BKE_modifier.h"
#include "BKE_object.h"
#include "BKE_paint.h"
#include "BKE_particle.h"
#include "BKE_pointcache.h"
#include "BKE_scene.h" #include "BKE_scene.h"
#include "BKE_smoke.h"
#include "BKE_softbody.h"
#include "BKE_subsurf.h" #include "BKE_subsurf.h"
#include "BKE_texture.h" #include "BKE_DerivedMesh.h"
#include "depsgraph_private.h"
#include "BKE_deform.h"
#include "CCGSubSurf.h" #include "CCGSubSurf.h"
#include "RE_shader_ext.h"
#include "MOD_modifiertypes.h" #include "MOD_modifiertypes.h"
@@ -143,7 +109,7 @@ static DerivedMesh *applyModifier(
} }
static DerivedMesh *applyModifierEM( static DerivedMesh *applyModifierEM(
ModifierData *md, Object *ob, EditMesh *editData, ModifierData *md, Object *ob, struct EditMesh *editData,
DerivedMesh *derivedData) DerivedMesh *derivedData)
{ {
SubsurfModifierData *smd = (SubsurfModifierData*) md; SubsurfModifierData *smd = (SubsurfModifierData*) md;

49
source/blender/modifiers/intern/MOD_surface.c
View File

@@ -32,56 +32,17 @@
#include "stddef.h" #include "stddef.h"
#include "string.h" #include "string.h"
#include "stdarg.h"
#include "math.h" #include "math.h"
#include "float.h" #include "float.h"
#include "BLI_kdtree.h" #include "BLI_math.h"
#include "BLI_rand.h"
#include "BLI_uvproject.h" #include "DNA_scene_types.h"
#include "DNA_object_types.h"
#include "DNA_meshdata_types.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "DNA_armature_types.h"
#include "DNA_camera_types.h"
#include "DNA_curve_types.h"
#include "DNA_key_types.h"
#include "DNA_material_types.h"
#include "DNA_object_fluidsim.h"
#include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_displist.h"
#include "BKE_fluidsim.h"
#include "BKE_global.h"
#include "BKE_multires.h"
#include "BKE_key.h"
#include "BKE_lattice.h"
#include "BKE_material.h"
#include "BKE_mesh.h"
#include "BKE_modifier.h"
#include "BKE_object.h"
#include "BKE_paint.h"
#include "BKE_particle.h"
#include "BKE_pointcache.h"
#include "BKE_scene.h"
#include "BKE_smoke.h"
#include "BKE_softbody.h"
#include "BKE_subsurf.h"
#include "BKE_texture.h"
#include "depsgraph_private.h"
#include "BKE_deform.h"
#include "BKE_shrinkwrap.h"
#include "LOD_decimation.h"
#include "CCGSubSurf.h"
#include "RE_shader_ext.h"
#include "MOD_modifiertypes.h" #include "MOD_modifiertypes.h"
#include "MOD_util.h" #include "MOD_util.h"

5
source/blender/modifiers/intern/MOD_util.c
View File

@@ -31,17 +31,12 @@
*/ */
#include "DNA_modifier_types.h" #include "DNA_modifier_types.h"
#include "DNA_customdata_types.h"
#include "DNA_texture_types.h"
#include "DNA_object_types.h" #include "DNA_object_types.h"
#include "DNA_mesh_types.h"
#include "DNA_curve_types.h" #include "DNA_curve_types.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "MOD_util.h" #include "MOD_util.h"
#include "BKE_customdata.h"
#include "BKE_DerivedMesh.h"
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_mesh.h" #include "BKE_mesh.h"
#include "BKE_displist.h" #include "BKE_displist.h"

63
source/blender/modifiers/intern/MOD_uvproject.c
View File

@@ -32,54 +32,21 @@
#include "stddef.h" #include "stddef.h"
#include "string.h" #include "string.h"
#include "stdarg.h"
#include "math.h" #include "math.h"
#include "float.h" #include "float.h"
#include "BLI_kdtree.h" #include "BLI_math.h"
#include "BLI_rand.h"
#include "BLI_uvproject.h" #include "BLI_uvproject.h"
#include "DNA_object_types.h"
#include "DNA_camera_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_customdata_types.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "DNA_armature_types.h" #include "BKE_DerivedMesh.h"
#include "DNA_camera_types.h"
#include "DNA_curve_types.h"
#include "DNA_key_types.h"
#include "DNA_material_types.h"
#include "DNA_object_fluidsim.h"
#include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_displist.h"
#include "BKE_fluidsim.h"
#include "BKE_global.h"
#include "BKE_multires.h"
#include "BKE_key.h"
#include "BKE_lattice.h"
#include "BKE_material.h"
#include "BKE_mesh.h"
#include "BKE_modifier.h"
#include "BKE_object.h"
#include "BKE_paint.h"
#include "BKE_particle.h"
#include "BKE_pointcache.h"
#include "BKE_scene.h"
#include "BKE_smoke.h"
#include "BKE_softbody.h"
#include "BKE_subsurf.h"
#include "BKE_texture.h"
#include "depsgraph_private.h" #include "depsgraph_private.h"
#include "BKE_deform.h"
#include "BKE_shrinkwrap.h"
#include "CCGSubSurf.h"
#include "RE_shader_ext.h"
#include "MOD_modifiertypes.h" #include "MOD_modifiertypes.h"
#include "MOD_util.h" #include "MOD_util.h"
@@ -152,7 +119,7 @@ static void foreachIDLink(ModifierData *md, Object *ob,
} }
static void updateDepgraph(ModifierData *md, static void updateDepgraph(ModifierData *md,
DagForest *forest, Scene *scene, Object *ob, DagNode *obNode) DagForest *forest, struct Scene *scene, Object *ob, DagNode *obNode)
{ {
UVProjectModifierData *umd = (UVProjectModifierData*) md; UVProjectModifierData *umd = (UVProjectModifierData*) md;
int i; int i;
@@ -368,16 +335,16 @@ static DerivedMesh *uvprojectModifier_do(UVProjectModifierData *umd,
Projector *best_projector; Projector *best_projector;
float best_dot; float best_dot;
VECCOPY(co1, coords[mf->v1]); copy_v3_v3(co1, coords[mf->v1]);
VECCOPY(co2, coords[mf->v2]); copy_v3_v3(co2, coords[mf->v2]);
VECCOPY(co3, coords[mf->v3]); copy_v3_v3(co3, coords[mf->v3]);
/* get the untransformed face normal */ /* get the untransformed face normal */
if(mf->v4) { if(mf->v4) {
VECCOPY(co4, coords[mf->v4]); copy_v3_v3(co4, coords[mf->v4]);
normal_quad_v3( face_no,co1, co2, co3, co4); normal_quad_v3(face_no, co1, co2, co3, co4);
} else { } else {
normal_tri_v3( face_no,co1, co2, co3); normal_tri_v3(face_no, co1, co2, co3);
} }
/* find the projector which the face points at most directly /* find the projector which the face points at most directly
@@ -456,7 +423,7 @@ static DerivedMesh *applyModifier(
} }
static DerivedMesh *applyModifierEM( static DerivedMesh *applyModifierEM(
ModifierData *md, Object *ob, EditMesh *editData, ModifierData *md, Object *ob, struct EditMesh *editData,
DerivedMesh *derivedData) DerivedMesh *derivedData)
{ {
return applyModifier(md, ob, derivedData, 0, 1); return applyModifier(md, ob, derivedData, 0, 1);

52
source/blender/modifiers/intern/MOD_wave.c
View File

@@ -32,52 +32,24 @@
#include "stddef.h" #include "stddef.h"
#include "string.h" #include "string.h"
#include "stdarg.h"
#include "math.h" #include "math.h"
#include "float.h" #include "float.h"
#include "BLI_kdtree.h" #include "BLI_math.h"
#include "BLI_rand.h"
#include "BLI_uvproject.h" #include "DNA_object_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_scene_types.h"
#include "DNA_customdata_types.h"
#include "BKE_DerivedMesh.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "DNA_armature_types.h"
#include "DNA_camera_types.h"
#include "DNA_curve_types.h"
#include "DNA_key_types.h"
#include "DNA_material_types.h"
#include "DNA_object_fluidsim.h"
#include "BKE_action.h"
#include "BKE_bmesh.h"
#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_displist.h"
#include "BKE_fluidsim.h"
#include "BKE_global.h"
#include "BKE_multires.h"
#include "BKE_key.h"
#include "BKE_lattice.h"
#include "BKE_material.h"
#include "BKE_mesh.h"
#include "BKE_modifier.h"
#include "BKE_object.h" #include "BKE_object.h"
#include "BKE_paint.h"
#include "BKE_particle.h"
#include "BKE_pointcache.h"
#include "BKE_scene.h"
#include "BKE_smoke.h"
#include "BKE_softbody.h"
#include "BKE_subsurf.h"
#include "BKE_texture.h"
#include "depsgraph_private.h" #include "depsgraph_private.h"
#include "BKE_deform.h" #include "BKE_deform.h"
#include "BKE_shrinkwrap.h"
#include "CCGSubSurf.h"
#include "RE_shader_ext.h" #include "RE_shader_ext.h"
@@ -263,15 +235,13 @@ static void wavemod_get_texture_coords(WaveModifierData *wmd, Object *ob,
for(i = 0; i < numVerts; ++i, ++co, ++texco) { for(i = 0; i < numVerts; ++i, ++co, ++texco) {
switch(texmapping) { switch(texmapping) {
case MOD_WAV_MAP_LOCAL: case MOD_WAV_MAP_LOCAL:
VECCOPY(*texco, *co); copy_v3_v3(*texco, *co);
break; break;
case MOD_WAV_MAP_GLOBAL: case MOD_WAV_MAP_GLOBAL:
VECCOPY(*texco, *co); mul_v3_m4v3(*texco, ob->obmat, *co);
mul_m4_v3(ob->obmat, *texco);
break; break;
case MOD_WAV_MAP_OBJECT: case MOD_WAV_MAP_OBJECT:
VECCOPY(*texco, *co); mul_v3_m4v3(*texco, ob->obmat, *co);
mul_m4_v3(ob->obmat, *texco);
mul_m4_v3(wmd->map_object->imat, *texco); mul_m4_v3(wmd->map_object->imat, *texco);
break; break;
} }
@@ -454,7 +424,7 @@ static void deformVerts(
} }
static void deformVertsEM( static void deformVertsEM(
ModifierData *md, Object *ob, EditMesh *editData, ModifierData *md, Object *ob, struct EditMesh *editData,
DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts)
{ {
DerivedMesh *dm= derivedData; DerivedMesh *dm= derivedData;