diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-04-17 19:47:00 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-04-17 19:47:00 +0400 |
commit | 392e1da1790d252f0f156379c1d5507959a4e17a (patch) | |
tree | 815d4055f1baada104f9843b05cd87b60b5c0fa2 /source/blender/editors | |
parent | 3afd8d6cc859255d0b52081fbee91b6c6a012b4c (diff) |
bugfix and cleanup
- BGE Shader.setSampler(name, index): index range check was wrong.
- Compositor check for an invalid channel was incorrect.
- getting the center of selected verts used an uninitalized z axis.
- do_init_render_material() used && rather then & when testing for MA_TRANSP.
- weight paint activate flipped bone used && rather then & for flag checking.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/armature/poseobject.c | 2 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_loop.c | 2 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_mods.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_nla/nla_edit.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c index 0c6bf04b8b9..a3d2c454d23 100644 --- a/source/blender/editors/armature/poseobject.c +++ b/source/blender/editors/armature/poseobject.c @@ -1459,7 +1459,7 @@ void pose_activate_flipped_bone(Scene *scene) if(ob==NULL) return; - if(ob->mode && OB_MODE_WEIGHT_PAINT) { + if(ob->mode & OB_MODE_WEIGHT_PAINT) { ob= modifiers_isDeformedByArmature(ob); } if(ob && (ob->mode & OB_MODE_POSE)) { diff --git a/source/blender/editors/mesh/editmesh_loop.c b/source/blender/editors/mesh/editmesh_loop.c index 90de0a01eea..643785ca200 100644 --- a/source/blender/editors/mesh/editmesh_loop.c +++ b/source/blender/editors/mesh/editmesh_loop.c @@ -629,7 +629,7 @@ static int knife_cut_exec(bContext *C, wmOperator *op) int len=0; short numcuts= RNA_int_get(op->ptr, "num_cuts"); short mode= RNA_int_get(op->ptr, "type"); - int corner_cut_pattern= RNA_enum_get(op->ptr,"corner_cut_pattern"); +// int corner_cut_pattern= RNA_enum_get(op->ptr,"corner_cut_pattern"); /* edit-object needed for matrix, and ar->regiondata for projections to work */ if (ELEM3(NULL, obedit, ar, ar->regiondata)) diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c index 7a5fd2d13cd..3a5d5380089 100644 --- a/source/blender/editors/mesh/editmesh_mods.c +++ b/source/blender/editors/mesh/editmesh_mods.c @@ -4058,7 +4058,7 @@ static void editmesh_calc_selvert_center(EditMesh *em, float cent_r[3]) EditVert *eve; int nsel= 0; - cent_r[0]= cent_r[1]= cent_r[0]= 0.0; + zero_v3(cent_r); for (eve= em->verts.first; eve; eve= eve->next) { if (eve->f & SELECT) { diff --git a/source/blender/editors/space_nla/nla_edit.c b/source/blender/editors/space_nla/nla_edit.c index 3319c36e92b..79aac30a7a4 100644 --- a/source/blender/editors/space_nla/nla_edit.c +++ b/source/blender/editors/space_nla/nla_edit.c @@ -903,7 +903,7 @@ static int nlaedit_bake_exec (bContext *C, wmOperator *op) ListBase anim_data = {NULL, NULL}; bAnimListElem *ale; int filter; - int flag = 0; +// int flag = 0; /* get editor data */ if (ANIM_animdata_get_context(C, &ac) == 0) |