diff options
Diffstat (limited to 'source')
4 files changed, 17 insertions, 8 deletions
diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index 95fcb84eb6f..97a6561ee68 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -78,17 +78,21 @@ extern void update_world_cos(Object *ob, PTCacheEdit *edit); #define KEY_K PTCacheEditKey *key; int k #define POINT_P PTCacheEditPoint *point; int p #define LOOP_POINTS for (p=0, point=edit->points; p<edit->totpoint; p++, point++) +#if 0 #define LOOP_VISIBLE_POINTS for (p=0, point=edit->points; p<edit->totpoint; p++, point++) if (!(point->flag & PEP_HIDE)) #define LOOP_SELECTED_POINTS for (p=0, point=edit->points; p<edit->totpoint; p++, point++) if (point_is_selected(point)) #define LOOP_UNSELECTED_POINTS for (p=0, point=edit->points; p<edit->totpoint; p++, point++) if (!point_is_selected(point)) #define LOOP_EDITED_POINTS for (p=0, point=edit->points; p<edit->totpoint; p++, point++) if (point->flag & PEP_EDIT_RECALC) #define LOOP_TAGGED_POINTS for (p=0, point=edit->points; p<edit->totpoint; p++, point++) if (point->flag & PEP_TAG) +#endif #define LOOP_KEYS for (k=0, key=point->keys; k<point->totkey; k++, key++) +#if 0 #define LOOP_VISIBLE_KEYS for (k=0, key=point->keys; k<point->totkey; k++, key++) if (!(key->flag & PEK_HIDE)) #define LOOP_SELECTED_KEYS for (k=0, key=point->keys; k<point->totkey; k++, key++) if ((key->flag & PEK_SELECT) && !(key->flag & PEK_HIDE)) #define LOOP_TAGGED_KEYS for (k=0, key=point->keys; k<point->totkey; k++, key++) if (key->flag & PEK_TAG) #define KEY_WCO (key->flag & PEK_USE_WCO ? key->world_co : key->co) +#endif static float I[4][4] = {{1.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 1.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 1.0f, 0.0f}, {0.0f, 0.0f, 0.0f, 1.0f}}; diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index f88dc789ba2..50c62821792 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -185,7 +185,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, int maxvert, maxpoly, maxloop, totpart = 0, first_particle = 0; int k, p, p_skip; short track = ob->trackflag % 3, trackneg, axis = pimd->axis; - float max_co = 0.0, min_co = 0.0, temp_co[3], cross[3]; + float max_co = 0.0, min_co = 0.0, temp_co[3]; float *size = NULL; trackneg = ((ob->trackflag > 2) ? 1 : 0); @@ -365,6 +365,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, unit_qt(state.rot); } else { + float cross[3]; float temp[3] = {0.0f, 0.0f, 0.0f}; temp[axis] = 1.0f; diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/physics/intern/BPH_mass_spring.cpp index c8e052c080e..112287150cd 100644 --- a/source/blender/physics/intern/BPH_mass_spring.cpp +++ b/source/blender/physics/intern/BPH_mass_spring.cpp @@ -582,8 +582,8 @@ static LinkNode *cloth_continuum_add_hair_segments(HairGrid *grid, const float c Implicit_Data *data = cloth->implicit;
LinkNode *next_spring_link = NULL; /* return value */
ClothSpring *spring1, *spring2, *spring3;
- ClothVertex *verts = cloth->verts;
- ClothVertex *vert3, *vert4;
+ // ClothVertex *verts = cloth->verts;
+ // ClothVertex *vert3, *vert4;
float x1[3], v1[3], x2[3], v2[3], x3[3], v3[3], x4[3], v4[3];
float dir1[3], dir2[3], dir3[3];
@@ -596,9 +596,9 @@ static LinkNode *cloth_continuum_add_hair_segments(HairGrid *grid, const float c zero_v3(x2); zero_v3(v2);
zero_v3(dir2);
- vert3 = &verts[spring3->kl];
+ // vert3 = &verts[spring3->kl];
cloth_get_grid_location(data, cell_scale, cell_offset, spring3->kl, x3, v3);
- vert4 = &verts[spring3->ij];
+ // vert4 = &verts[spring3->ij];
cloth_get_grid_location(data, cell_scale, cell_offset, spring3->ij, x4, v4);
sub_v3_v3v3(dir3, x4, x3);
normalize_v3(dir3);
@@ -608,7 +608,7 @@ static LinkNode *cloth_continuum_add_hair_segments(HairGrid *grid, const float c spring1 = spring2;
spring2 = spring3;
- vert3 = vert4;
+ // vert3 = vert4;
copy_v3_v3(x1, x2); copy_v3_v3(v1, v2);
copy_v3_v3(x2, x3); copy_v3_v3(v2, v3);
@@ -623,14 +623,14 @@ static LinkNode *cloth_continuum_add_hair_segments(HairGrid *grid, const float c if (spring_link) {
spring3 = (ClothSpring *)spring_link->link;
- vert4 = &verts[spring3->ij];
+ // vert4 = &verts[spring3->ij];
cloth_get_grid_location(data, cell_scale, cell_offset, spring3->ij, x4, v4);
sub_v3_v3v3(dir3, x4, x3);
normalize_v3(dir3);
}
else {
spring3 = NULL;
- vert4 = NULL;
+ // vert4 = NULL;
zero_v3(x4); zero_v3(v4);
zero_v3(dir3);
}
diff --git a/source/blender/physics/intern/implicit_blender.c b/source/blender/physics/intern/implicit_blender.c index 9f43e793e05..ce65703901a 100644 --- a/source/blender/physics/intern/implicit_blender.c +++ b/source/blender/physics/intern/implicit_blender.c @@ -326,6 +326,7 @@ static void print_sparse_matrix(fmatrix3x3 *m) } #endif +#if 0 static void print_lvector(lfVector *v, int numverts) { int i; @@ -338,7 +339,9 @@ static void print_lvector(lfVector *v, int numverts) printf("%f,\n", v[i][2]); } } +#endif +#if 0 static void print_bfmatrix(fmatrix3x3 *m) { int tot = m[0].vcount + m[0].scount; @@ -381,6 +384,7 @@ static void print_bfmatrix(fmatrix3x3 *m) MEM_freeN(t); } +#endif /* copy 3x3 matrix */ DO_INLINE void cp_fmatrix(float to[3][3], float from[3][3]) |