Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorNathan Letwory <nathan@letworyinteractive.com>2010-10-24 16:45:47 +0400
committerNathan Letwory <nathan@letworyinteractive.com>2010-10-24 16:45:47 +0400
commit715fa82769a2d239bdf73701719ae354ca527c59 (patch)
tree1563f780591947249d994526c9086cc99df290bf /source
parent989a610fc8a7af6ae8fa65695278d69faf93a898 (diff)
Make sure separation between modifier keys is communicated from GHOST upwards too (BGE at least uses this).
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/curve.c3
-rw-r--r--source/blender/blenkernel/intern/customdata.c3
-rw-r--r--source/blender/blenkernel/intern/effect.c3
-rw-r--r--source/blender/editors/space_view3d/drawobject.c3
-rw-r--r--source/blender/modifiers/intern/MOD_screw.c3
5 files changed, 10 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index 06ba066efdd..a7dd80bff4d 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -1939,10 +1939,11 @@ static void make_bevel_list_3D_tangent(BevList *bl)
/* make perpendicular, modify tan in place, is ok */
float cross_tmp[3];
+ float zero[3] = {0,0,0};
cross_v3_v3v3(cross_tmp, bevp1->tan, bevp1->dir);
normalize_v3(cross_tmp);
- tri_to_quat( bevp1->quat, (float [3]){0,0,0}, cross_tmp, bevp1->tan); /* XXX - could be faster */
+ tri_to_quat( bevp1->quat,zero, cross_tmp, bevp1->tan); /* XXX - could be faster */
bevp0= bevp1;
bevp1= bevp2;
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 3eec7611697..9c4f0d790ca 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -502,7 +502,8 @@ static void layerInterp_mdisps(void **UNUSED(sources), float *UNUSED(weights),
/* Initialize the destination */
for(i = 0; i < d->totdisp; ++i) {
- zero_v3(d->disps[i]);
+ float z[3] = {0,0,0};
+ copy_v3_v3(d->disps[i], z);
}
/* For now, some restrictions on the input */
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c
index 47606c39937..70e814ef956 100644
--- a/source/blender/blenkernel/intern/effect.c
+++ b/source/blender/blenkernel/intern/effect.c
@@ -1007,7 +1007,8 @@ void pdDoEffectors(ListBase *effectors, ListBase *colliders, EffectorWeights *we
else if(eff->pd->forcefield == PFIELD_TEXTURE)
do_texture_effector(eff, &efd, point, force);
else {
- float temp1[3]={force[0], force[1], force[2]}, temp2[3];
+ float temp1[3]={0,0,0}, temp2[3];
+ VECCOPY(temp1, force);
do_physical_effector(eff, &efd, point, force);
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 171c5a311c1..bc340ef5b4b 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -6139,7 +6139,8 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
/* patch for several 3d cards (IBM mostly) that crash on glSelect with text drawing */
/* but, we also dont draw names for sets or duplicators */
if(flag == 0) {
- view3d_cached_text_draw_add((float [3]){0,0,0}, ob->id.name+2, 10, 0);
+ float zero[3]= {0,0,0};
+ view3d_cached_text_draw_add(zero, ob->id.name+2, 10, 0);
}
}
/*if(dtx & OB_DRAWIMAGE) drawDispListwire(&ob->disp);*/
diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c
index b71249880a6..668f0a086d1 100644
--- a/source/blender/modifiers/intern/MOD_screw.c
+++ b/source/blender/modifiers/intern/MOD_screw.c
@@ -212,8 +212,9 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
float totlen = len_v3(mtx_tx[3]);
if(totlen != 0.0f) {
+ float zero[3]={0.0f, 0.0f, 0.0f};
float cp[3];
- screw_ofs= closest_to_line_v3(cp, mtx_tx[3], (float []){0,0,0}, axis_vec);
+ screw_ofs= closest_to_line_v3(cp, mtx_tx[3], zero, axis_vec);
}
else {
screw_ofs= 0.0f;