Revision: 23307
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23307
Author: blendix
Date: 2009-09-17 16:46:22 +0200 (Thu, 17 Sep 2009)
Log Message:
-----------
Warning fixes for blenkernel and editors.
Note sure what to do with this one, and personally think
we should avoid using macros for this kind of thing:
V_GROW(edges);
source/blender/editors/mesh/loopcut.c:232: warning: value computed is not used
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/fcurve.c
trunk/blender/source/blender/blenkernel/intern/implicit.c
trunk/blender/source/blender/blenkernel/intern/modifier.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/text.c
trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/mesh/loopcut.c
trunk/blender/source/blender/editors/object/object_select.c
trunk/blender/source/blender/editors/physics/editparticle.c
trunk/blender/source/blender/editors/preview/previewrender.c
trunk/blender/source/blender/editors/space_image/image_draw.c
trunk/blender/source/blender/editors/space_view3d/drawvolume.c
trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
trunk/blender/source/blender/makesrna/intern/rna_pose.c
trunk/blender/source/blender/render/intern/source/volumetric.c
Modified: trunk/blender/source/blender/blenkernel/intern/fcurve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/fcurve.c 2009-09-17
14:37:08 UTC (rev 23306)
+++ trunk/blender/source/blender/blenkernel/intern/fcurve.c 2009-09-17
14:46:22 UTC (rev 23307)
@@ -1026,6 +1026,7 @@
}
}
+#if 0
static void berekenx (float *f, float *o, int b)
{
float t, c0, c1, c2, c3;
@@ -1041,6 +1042,7 @@
o[a]= c0 + t*c1 + t*t*c2 + t*t*t*c3;
}
}
+#endif
/* -------------------------- */
Modified: trunk/blender/source/blender/blenkernel/intern/implicit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/implicit.c 2009-09-17
14:37:08 UTC (rev 23306)
+++ trunk/blender/source/blender/blenkernel/intern/implicit.c 2009-09-17
14:46:22 UTC (rev 23307)
@@ -496,6 +496,7 @@
// SPARSE SYMMETRIC big matrix with 3x3 matrix entries
///////////////////////////
/* printf a big matrix on console: for debug output */
+#if 0
static void print_bfmatrix(fmatrix3x3 *m3)
{
unsigned int i = 0;
@@ -505,6 +506,8 @@
print_fmatrix(m3[i].m);
}
}
+#endif
+
/* create big matrix */
DO_INLINE fmatrix3x3 *create_bfmatrix(unsigned int verts, unsigned int springs)
{
@@ -1417,7 +1420,6 @@
int i = 0;
int j = 0;
int k = 0;
- lfVector temp;
INIT_MINMAX(gmin, gmax);
Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c 2009-09-17
14:37:08 UTC (rev 23306)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c 2009-09-17
14:46:22 UTC (rev 23307)
@@ -8503,6 +8503,7 @@
mti->initData = smoothModifier_initData;
mti->copyData = smoothModifier_copyData;
mti->requiredDataMask = smoothModifier_requiredDataMask;
+ mti->isDisabled = smoothModifier_isDisabled;
mti->deformVerts = smoothModifier_deformVerts;
mti->deformVertsEM = smoothModifier_deformVertsEM;
@@ -8513,6 +8514,7 @@
mti->initData = castModifier_initData;
mti->copyData = castModifier_copyData;
mti->requiredDataMask = castModifier_requiredDataMask;
+ mti->isDisabled = castModifier_isDisabled;
mti->foreachObjectLink = castModifier_foreachObjectLink;
mti->updateDepgraph = castModifier_updateDepgraph;
mti->deformVerts = castModifier_deformVerts;
@@ -9137,19 +9139,6 @@
return i;
}
-static int modifiers_usesPointCache(Object *ob)
-{
- ModifierData *md = ob->modifiers.first;
-
- for (; md; md=md->next) {
- ModifierTypeInfo *mti = modifierType_getInfo(md->type);
- if (mti->flags & eModifierTypeFlag_UsesPointCache) {
- return 1;
- }
- }
- return 0;
-}
-
void modifier_freeTemporaryData(ModifierData *md)
{
if(md->type == eModifierType_Armature) {
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2009-09-17
14:37:08 UTC (rev 23306)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2009-09-17
14:46:22 UTC (rev 23307)
@@ -2562,7 +2562,7 @@
static int pc_cmp(void *a, void *b)
{
LinkData *ad = a, *bd = b;
- if((int)ad->data > (int)bd->data)
+ if(GET_INT_FROM_POINTER(ad->data) > GET_INT_FROM_POINTER(bd->data))
return 1;
else return 0;
}
@@ -2576,14 +2576,14 @@
for(link=ob->pc_ids.first, i = 0; link; link=link->next, i++)
{
- int index =(int)link->data;
+ int index = GET_INT_FROM_POINTER(link->data);
if(i < index)
break;
}
link = MEM_callocN(sizeof(LinkData), "PCLink");
- link->data = (void *)i;
+ link->data = SET_INT_IN_POINTER(i);
BLI_addtail(&ob->pc_ids, link);
return i;
Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c 2009-09-17
14:37:08 UTC (rev 23306)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c 2009-09-17
14:46:22 UTC (rev 23307)
@@ -81,7 +81,6 @@
#include "RE_render_ext.h"
-static void key_from_object(Object *ob, ParticleKey *key);
static void get_cpa_texture(DerivedMesh *dm, Material *ma, int face_index,
float *fuv, float *orco, ParticleTexture *ptex,
int event);
static void get_child_modifier_parameters(ParticleSettings *part,
ParticleThreadContext *ctx,
@@ -3039,6 +3038,7 @@
VECSUB(key->vel,key->vel,key->co);
QuatMul(key->rot,q,key->rot);
}
+#if 0
static void key_from_object(Object *ob, ParticleKey *key){
float q[4];
@@ -3051,6 +3051,7 @@
VECSUB(key->vel,key->vel,key->co);
QuatMul(key->rot,q,key->rot);
}
+#endif
static void triatomat(float *v1, float *v2, float *v3, float (*uv)[2], float
mat[][4])
{
Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c
2009-09-17 14:37:08 UTC (rev 23306)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c
2009-09-17 14:46:22 UTC (rev 23307)
@@ -122,7 +122,6 @@
void psys_reset(ParticleSystem *psys, int mode)
{
- ParticleSettings *part= psys->part;
PARTICLE_P;
if(ELEM(mode, PSYS_RESET_ALL, PSYS_RESET_DEPSGRAPH)) {
Modified: trunk/blender/source/blender/blenkernel/intern/text.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/text.c 2009-09-17
14:37:08 UTC (rev 23306)
+++ trunk/blender/source/blender/blenkernel/intern/text.c 2009-09-17
14:46:22 UTC (rev 23307)
@@ -596,17 +596,15 @@
return tmp;
}
-static TextLine *txt_new_linen(char *str, int n)
+static TextLine *txt_new_linen(const char *str, int n)
{
TextLine *tmp;
- if(!str) str= "";
-
tmp= (TextLine *) MEM_mallocN(sizeof(TextLine), "textline");
tmp->line= MEM_mallocN(n+1, "textline_string");
tmp->format= NULL;
- BLI_strncpy(tmp->line, str, n+1);
+ BLI_strncpy(tmp->line, (str)? str: "", n+1);
tmp->len= strlen(tmp->line);
tmp->next= tmp->prev= NULL;
Modified: trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
2009-09-17 14:37:08 UTC (rev 23306)
+++ trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
2009-09-17 14:46:22 UTC (rev 23307)
@@ -148,7 +148,7 @@
#else
pkt.pts = c->coded_frame->pts;
#endif
- fprintf(stderr, "Audio Frame PTS: %lld\n", pkt.pts);
+ fprintf(stderr, "Audio Frame PTS: %d\n", (int)pkt.pts);
pkt.stream_index = audio_stream->index;
pkt.flags |= PKT_FLAG_KEY;
@@ -265,7 +265,7 @@
#else
packet.pts = c->coded_frame->pts;
#endif
- fprintf(stderr, "Video Frame PTS: %lld\n", packet.pts);
+ fprintf(stderr, "Video Frame PTS: %d\n",
(int)packet.pts);
} else {
fprintf(stderr, "Video Frame PTS: not set\n");
}
Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2009-09-17
14:37:08 UTC (rev 23306)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2009-09-17
14:46:22 UTC (rev 23307)
@@ -482,11 +482,10 @@
static int removedoublesflag_exec(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
- ToolSettings *ts= CTX_data_tool_settings(C);
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
- char msg[100];
+ /*char msg[100];
- int cnt = removedoublesflag(em,1,0,RNA_float_get(op->ptr, "limit"));
+ int cnt = removedoublesflag(em,1,0,RNA_float_get(op->ptr, "limit"));*/
/*XXX this messes up last operator panel
if(cnt)
Modified: trunk/blender/source/blender/editors/mesh/loopcut.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/loopcut.c 2009-09-17 14:37:08 UTC
(rev 23306)
+++ trunk/blender/source/blender/editors/mesh/loopcut.c 2009-09-17 14:46:22 UTC
(rev 23307)
@@ -129,7 +129,7 @@
float (*edges)[2][3] = NULL;
V_DYNDECLARE(edges);
float co[2][3];
- int looking=1, i, j=0, tot=0;
+ int looking=1, i, tot=0;
if (!startedge)
return;
@@ -318,7 +318,6 @@
static int ringsel_invoke (bContext *C, wmOperator *op, wmEvent *evt)
{
- ScrArea *sa = CTX_wm_area(C);
tringselOpData *lcd;
EditEdge *edge;
int dist = 75;
@@ -347,7 +346,6 @@
static int ringcut_invoke (bContext *C, wmOperator *op, wmEvent *evt)
{
- ScrArea *sa = CTX_wm_area(C);
tringselOpData *lcd;
EditEdge *edge;
int dist = 75;
Modified: trunk/blender/source/blender/editors/object/object_select.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_select.c 2009-09-17
14:37:08 UTC (rev 23306)
+++ trunk/blender/source/blender/editors/object/object_select.c 2009-09-17
14:46:22 UTC (rev 23307)
@@ -30,6 +30,8 @@
#include <stdlib.h>
#include <string.h>
+#include "MEM_guardedalloc.h"
+
#include "DNA_group_types.h"
#include "DNA_material_types.h"
#include "DNA_modifier_types.h"
Modified: trunk/blender/source/blender/editors/physics/editparticle.c
===================================================================
--- trunk/blender/source/blender/editors/physics/editparticle.c 2009-09-17
14:37:08 UTC (rev 23306)
+++ trunk/blender/source/blender/editors/physics/editparticle.c 2009-09-17
14:46:22 UTC (rev 23307)
@@ -3911,7 +3911,6 @@
{
Scene *scene= CTX_data_scene(C);
ParticleEditSettings *pset=PE_settings(scene);
- PTCacheEdit *edit = PE_get_current(scene, CTX_data_active_object(C));
uiPopupMenu *pup;
uiLayout *layout;
Modified: trunk/blender/source/blender/editors/preview/previewrender.c
===================================================================
--- trunk/blender/source/blender/editors/preview/previewrender.c
2009-09-17 14:37:08 UTC (rev 23306)
+++ trunk/blender/source/blender/editors/preview/previewrender.c
2009-09-17 14:46:22 UTC (rev 23307)
@@ -635,7 +635,6 @@
/* afterqueue call */
void BIF_view3d_previewrender(Scene *scene, ScrArea *sa)
{
- bContext *C= NULL;
View3D *v3d= sa->spacedata.first;
RegionView3D *rv3d= NULL; // XXX
Render *re;
Modified: trunk/blender/source/blender/editors/space_image/image_draw.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
