- fix for BL_Shader::SetUniform() missing out the last part of the matrix.

- particle.c wasn't setting all components of the vector when reading cache and setting dummy velocity values.
- some functions incorrectly took a float[3] argument when the 4th value was set.
- remove a few redundant lines of code.

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index dff62b05bd35fc0a6763f17448dea71772456f19..5bdda8d5867d9e4a1a03a40231a6b68d0fe06507 100644 (file)
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -3134,7 +3134,7 @@ int object_is_modified(Scene *scene, Object *ob)
        int flag= 0;
 
        if(ob_get_key(ob)) {
-               flag |= eModifierMode_Render | eModifierMode_Render;
+               flag |= eModifierMode_Render;
        }
        else {
                ModifierData *md;

diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 9aa1c6e29ebe1fd97dc75fa571d43fdc262db78c..86c646fa2571cea7f9b5c786a163ff30ed8d6062 100644 (file)
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -3161,7 +3161,7 @@ void psys_cache_edit_paths(Scene *scene, Object *ob, PTCacheEdit *edit, float cf
                        }
                        else {
                                ca->vel[0] = ca->vel[1] = 0.0f;
-                               ca->vel[1] = 1.0f;
+                               ca->vel[2] = 1.0f;
                        }
 
                        /* selection coloring in edit mode */

diff --git a/source/blender/editors/physics/physics_pointcache.c b/source/blender/editors/physics/physics_pointcache.c
index 797ead3cd90ccf932d10eb95b2f7434d9e5ca0db..34f4a1e472b24f00fa5405fb388a64f83e9bcc61 100644 (file)
--- a/source/blender/editors/physics/physics_pointcache.c
+++ b/source/blender/editors/physics/physics_pointcache.c
@@ -172,7 +172,6 @@ void PTCACHE_OT_free_bake_all(wmOperatorType *ot)
 {
        /* identifiers */
        ot->name= "Free All Physics Bakes";
-       ot->name= "Free all physics bakes";
        ot->idname= "PTCACHE_OT_free_bake_all";
        
        /* api callbacks */

diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c
index 32004fd4525b2bbc62ddde86810b17d2708ef55b..d69c1d9c4470f9c51e46ec31d19d30c65695edf8 100644 (file)
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -512,7 +512,7 @@ static float VecZDepthOrtho(float pt[2], float v1[3], float v2[3], float v3[3],
        return (v1[2]*w[0]) + (v2[2]*w[1]) + (v3[2]*w[2]);
 }
 
-static float VecZDepthPersp(float pt[2], float v1[3], float v2[3], float v3[3], float w[3])
+static float VecZDepthPersp(float pt[2], float v1[4], float v2[4], float v3[4], float w[3])
 {
        float wtot_inv, wtot;
        float w_tmp[3];
@@ -1193,7 +1193,7 @@ static void screen_px_from_ortho(
  * the perspective W coord for each vert */
 static void screen_px_from_persp(
                float uv[2],
-               float v1co[3], float v2co[3], float v3co[3], /* screenspace coords */
+               float v1co[4], float v2co[4], float v3co[4], /* screenspace coords */
                float uv1co[2], float uv2co[2], float uv3co[2],
                float pixelScreenCo[4],
                float w[3])

diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c
index ad621257602021f0e0f433355e3fb2976c50c3dc..103a03eece200066ed87add7b71f23896d654c22 100644 (file)
--- a/source/blender/editors/space_view3d/drawarmature.c
+++ b/source/blender/editors/space_view3d/drawarmature.c
@@ -316,11 +316,9 @@ static float cube[8][3] = {
 static void drawsolidcube_size(float xsize, float ysize, float zsize)
 {
        static GLuint displist=0;
-       float n[3];
+       float n[3]= {0.0f};
        
        glScalef(xsize, ysize, zsize);
-       
-       n[0]=0; n[1]=0; n[2]=0;
 
        if(displist==0) {
                displist= glGenLists(1);
@@ -346,7 +344,6 @@ static void drawsolidcube_size(float xsize, float ysize, float zsize)
                n[2]= 1.0;
                glNormal3fv(n); 
                glVertex3fv(cube[1]); glVertex3fv(cube[5]); glVertex3fv(cube[6]); glVertex3fv(cube[2]);
-               n[2]=0;
                n[2]= -1.0;
                glNormal3fv(n); 
                glVertex3fv(cube[7]); glVertex3fv(cube[4]); glVertex3fv(cube[0]); glVertex3fv(cube[3]);

diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c
index 70659994c558fc863a841945731940a843cce225..0515941497591e95c73de2ec61fe280a7b4e7b02 100644 (file)
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -833,7 +833,7 @@ static int select_edgeloop(Scene *scene, Image *ima, EditMesh *em, NearestHit *h
        if(extend) {
                tf= CustomData_em_get(&em->fdata, hit->efa->data, CD_MTFACE);
 
-               if(uvedit_uv_selected(scene, hit->efa, tf, hit->edge) && uvedit_uv_selected(scene, hit->efa, tf, hit->edge))
+               if(uvedit_uv_selected(scene, hit->efa, tf, hit->edge))
                        select= 0;
                else
                        select= 1;

diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c
index 28624e9350c964abc029909b3d7658de3f3a5756..15b96b6d808b0958d2e8e6e1077ed0f70ad43a8f 100644 (file)
--- a/source/blender/gpu/intern/gpu_material.c
+++ b/source/blender/gpu/intern/gpu_material.c
@@ -358,7 +358,7 @@ void GPU_material_enable_alpha(GPUMaterial *material)
        material->alpha= 1;
 }
 
-GPUBlendMode GPU_material_blend_mode(GPUMaterial *material, float obcol[3])
+GPUBlendMode GPU_material_blend_mode(GPUMaterial *material, float obcol[4])
 {
        if(material->alpha || (material->obcolalpha && obcol[3] < 1.0f))
                return GPU_BLEND_ALPHA;

diff --git a/source/gameengine/Ketsji/BL_Shader.cpp b/source/gameengine/Ketsji/BL_Shader.cpp
index 621cabfe0cf56d1d47eb5516a429e0718c431148..aea33246a3fc9f66957d9f176d414c4a7579935b 100644 (file)
--- a/source/gameengine/Ketsji/BL_Shader.cpp
+++ b/source/gameengine/Ketsji/BL_Shader.cpp
@@ -690,7 +690,7 @@ void BL_Shader::SetUniform(int uniform, const MT_Matrix3x3& vec, bool transpose)
                float value[9];
                value[0] = (float)vec[0][0]; value[1] = (float)vec[1][0]; value[2] = (float)vec[2][0]; 
                value[3] = (float)vec[0][1]; value[4] = (float)vec[1][1]; value[5] = (float)vec[2][1]; 
-               value[6] = (float)vec[0][2]; value[7] = (float)vec[1][2]; value[7] = (float)vec[2][2]; 
+               value[6] = (float)vec[0][2]; value[7] = (float)vec[1][2]; value[8] = (float)vec[2][2];
                glUniformMatrix3fvARB(uniform, 1, transpose?GL_TRUE:GL_FALSE, value);
        }
 }