Compiler warning fixes:
authorJoshua Leung <aligorith@gmail.com>
Mon, 28 Apr 2008 00:40:38 +0000 (00:40 +0000)
committerJoshua Leung <aligorith@gmail.com>
Mon, 28 Apr 2008 00:40:38 +0000 (00:40 +0000)
* in scene.c in blenkernel, set_last_seq (defined in src - editseq.c) is called... this may/may not need some stubs for game-engine stuff
* removed unused vars due to old particle-effects stuff

source/blender/blenkernel/intern/implicit.c
source/blender/blenkernel/intern/scene.c
source/blender/python/api2_2x/Effect.c
source/blender/src/buttons_object.c
source/blender/src/drawimasel.c
source/blender/src/drawscene.c
source/blender/src/editipo.c

index 39fe6ba23bd36ce73d2fbaff07a7e190030e7c11..808984aaa3c985b4e88c3dfff5eaf9e8c2715987 100644 (file)
@@ -1368,7 +1368,7 @@ void cloth_calc_force(ClothModifierData *clmd, lfVector *lF, lfVector *lX, lfVec
        float           gravity[3];
        float           tm2[3][3]       = {{-spring_air,0,0}, {0,-spring_air,0},{0,0,-spring_air}};
        MFace           *mfaces         = cloth->mfaces;
-       ClothVertex     *verts          = cloth->verts;
+       //ClothVertex   *verts          = cloth->verts;
        float wind_normalized[3];
        unsigned int numverts = cloth->numverts;
        LinkNode *search = cloth->springs;
index d6ab9176c0c16136305a8a67f22421b8b08803c7..6798c3c47b70bf0e9ed88a91ec0ad566f8281bb7 100644 (file)
@@ -79,6 +79,7 @@
 #include "BKE_utildefines.h"
 
 #include "BIF_previewrender.h"
+#include "BIF_editseq.h"
 
 #include "BPY_extern.h"
 #include "BLI_arithb.h"
@@ -295,6 +296,7 @@ void set_scene_bg(Scene *sce)
        GroupObject *go;
        int flag;
        
+       // Note: this here is defined in editseq.c (BIF_editseq.h), NOT in blenkernel! 
        set_last_seq(NULL);
        
        G.scene= sce;
index 60c2e0861839ca8cd01bdd25bd1647073398ff21..4d3dce741fc9baa5b7967acf81b72da24f54778a 100644 (file)
@@ -584,7 +584,7 @@ static PyObject *Effect_FlagsDict( void )
        PyObject *Flags = PyConstant_New(  );
 
        if( Flags ) {
-               BPy_constant *c = ( BPy_constant * ) Flags;
+               //BPy_constant *c = ( BPy_constant * ) Flags;
                /* removed */
        }
        return Flags;
index 7dba58c8a8f2964cdac80d9a4b4d055866a1a76a..d58a283b6d185144e3a167ec3d3fc30ed82503ea 100644 (file)
@@ -2289,7 +2289,6 @@ void fluidsimFilesel(char *selection)
 void do_object_panels(unsigned short event)
 {
        Object *ob;
-       Effect *eff;
        
        ob= OBACT;
        if(ob==NULL)
@@ -2841,8 +2840,6 @@ void object_panel_constraint(char *context)
 void do_effects_panels(unsigned short event)
 {
        Object *ob;
-       Base *base;
-       Effect *eff, *effn;
        ModifierData *md;
        ParticleSystemModifierData *psmd;
        ParticleSystem *psys;
index 5a8aea7e01f6c66586431994e6879993bf6aad4e..891bf488d17e8db0f829eb7467274432bc41bcfa 100644 (file)
@@ -53,6 +53,7 @@
 #include "BLI_winstuff.h"
 #endif
 
+#include "BMF_Api.h"
 
 #include "BKE_global.h"
 #include "BKE_library.h"
index 35a675abb1d8cf2a293da84412a6f4cd93b8c501..124a09da3a2f85f95315c4c79579f41f35450e17 100644 (file)
@@ -50,6 +50,7 @@
 
 #include "BIF_space.h"
 #include "BIF_drawscene.h"
+#include "BIF_editseq.h"
 #include "BIF_poseobject.h"
 
 #include "BSE_view.h"
index 0af21a5c59549ff45083ffb854d8cb000f208ca4..cbde4892216768331bf97215b8e18f131090b14a 100644 (file)
@@ -2053,7 +2053,7 @@ static int binarysearch_bezt_index (BezTriple array[], BezTriple *item, int arra
                /* check whether to add before/after/on */
                float framenum;
                
-               /* 'First' Keyframe     */
+               /* 'First' Keyframe (when only one keyframe, this case is used) */
                framenum= array[0].vec[1][0];
                if (IS_EQT(frame, framenum, BEZT_INSERT_THRESH))
                        return -1;