Revision: 14582
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14582
Author: aligorith
Date: 2008-04-28 02:40:38 +0200 (Mon, 28 Apr 2008)
Log Message:
-----------
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
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/implicit.c
trunk/blender/source/blender/blenkernel/intern/scene.c
trunk/blender/source/blender/python/api2_2x/Effect.c
trunk/blender/source/blender/src/buttons_object.c
trunk/blender/source/blender/src/drawimasel.c
trunk/blender/source/blender/src/drawscene.c
trunk/blender/source/blender/src/editipo.c
Modified: trunk/blender/source/blender/blenkernel/intern/implicit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/implicit.c 2008-04-27
22:34:19 UTC (rev 14581)
+++ trunk/blender/source/blender/blenkernel/intern/implicit.c 2008-04-28
00:40:38 UTC (rev 14582)
@@ -1368,7 +1368,7 @@
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;
Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c 2008-04-27
22:34:19 UTC (rev 14581)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c 2008-04-28
00:40:38 UTC (rev 14582)
@@ -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 @@
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;
Modified: trunk/blender/source/blender/python/api2_2x/Effect.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Effect.c 2008-04-27
22:34:19 UTC (rev 14581)
+++ trunk/blender/source/blender/python/api2_2x/Effect.c 2008-04-28
00:40:38 UTC (rev 14582)
@@ -584,7 +584,7 @@
PyObject *Flags = PyConstant_New( );
if( Flags ) {
- BPy_constant *c = ( BPy_constant * ) Flags;
+ //BPy_constant *c = ( BPy_constant * ) Flags;
/* removed */
}
return Flags;
Modified: trunk/blender/source/blender/src/buttons_object.c
===================================================================
--- trunk/blender/source/blender/src/buttons_object.c 2008-04-27 22:34:19 UTC
(rev 14581)
+++ trunk/blender/source/blender/src/buttons_object.c 2008-04-28 00:40:38 UTC
(rev 14582)
@@ -2289,7 +2289,6 @@
void do_object_panels(unsigned short event)
{
Object *ob;
- Effect *eff;
ob= OBACT;
if(ob==NULL)
@@ -2841,8 +2840,6 @@
void do_effects_panels(unsigned short event)
{
Object *ob;
- Base *base;
- Effect *eff, *effn;
ModifierData *md;
ParticleSystemModifierData *psmd;
ParticleSystem *psys;
Modified: trunk/blender/source/blender/src/drawimasel.c
===================================================================
--- trunk/blender/source/blender/src/drawimasel.c 2008-04-27 22:34:19 UTC
(rev 14581)
+++ trunk/blender/source/blender/src/drawimasel.c 2008-04-28 00:40:38 UTC
(rev 14582)
@@ -53,6 +53,7 @@
#include "BLI_winstuff.h"
#endif
+#include "BMF_Api.h"
#include "BKE_global.h"
#include "BKE_library.h"
Modified: trunk/blender/source/blender/src/drawscene.c
===================================================================
--- trunk/blender/source/blender/src/drawscene.c 2008-04-27 22:34:19 UTC
(rev 14581)
+++ trunk/blender/source/blender/src/drawscene.c 2008-04-28 00:40:38 UTC
(rev 14582)
@@ -50,6 +50,7 @@
#include "BIF_space.h"
#include "BIF_drawscene.h"
+#include "BIF_editseq.h"
#include "BIF_poseobject.h"
#include "BSE_view.h"
Modified: trunk/blender/source/blender/src/editipo.c
===================================================================
--- trunk/blender/source/blender/src/editipo.c 2008-04-27 22:34:19 UTC (rev
14581)
+++ trunk/blender/source/blender/src/editipo.c 2008-04-28 00:40:38 UTC (rev
14582)
@@ -2053,7 +2053,7 @@
/* 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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
