Compiler warning fixes:
* 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
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -53,6 +53,7 @@
|
||||
#include "BLI_winstuff.h"
|
||||
#endif
|
||||
|
||||
#include "BMF_Api.h"
|
||||
|
||||
#include "BKE_global.h"
|
||||
#include "BKE_library.h"
|
||||
|
||||
@@ -50,6 +50,7 @@
|
||||
|
||||
#include "BIF_space.h"
|
||||
#include "BIF_drawscene.h"
|
||||
#include "BIF_editseq.h"
|
||||
#include "BIF_poseobject.h"
|
||||
|
||||
#include "BSE_view.h"
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user