Revision: 35971
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35971
Author: campbellbarton
Date: 2011-04-03 10:04:16 +0000 (Sun, 03 Apr 2011)
Log Message:
-----------
quiet various warnings, also disable -Wdouble-promotion with cmake since it
gives warnings with variable length args.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/source/blender/blenkernel/intern/anim_sys.c
trunk/blender/source/blender/blenlib/BLI_utildefines.h
trunk/blender/source/blender/editors/interface/interface_icons.c
trunk/blender/source/blender/editors/physics/physics_fluid.c
trunk/blender/source/blender/editors/space_action/action_ops.c
trunk/blender/source/blender/editors/space_graph/graph_ops.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_scopes.c
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/gpu/intern/gpu_draw.c
trunk/blender/source/blender/makesrna/intern/rna_constraint.c
trunk/blender/source/blender/makesrna/intern/rna_define.c
trunk/blender/source/blender/makesrna/intern/rna_gpencil.c
trunk/blender/source/blender/makesrna/intern/rna_wm_api.c
trunk/blender/source/blender/modifiers/intern/MOD_explode.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_at.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_checker.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_compose.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_coord.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_curves.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_decompose.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_distance.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_image.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_invert.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_math.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_output.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_proc.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_texture.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_translate.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c
trunk/blender/source/blender/python/intern/bpy_rna.h
trunk/blender/source/blender/python/intern/bpy_rna_anim.c
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-04-03 07:48:33 UTC (rev 35970)
+++ trunk/blender/CMakeLists.txt 2011-04-03 10:04:16 UTC (rev 35971)
@@ -1059,7 +1059,8 @@
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_POINTER_ARITH
-Wpointer-arith)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_PARAMETER
-Wunused-parameter)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_WRITE_STRINGS
-Wwrite-strings)
- ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_DOUBLE_PROMOTION
-Wdouble-promotion -Wno-error=double-promotion)
+ # disable because it gives warnings for printf() & friends.
+ # ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_DOUBLE_PROMOTION
-Wdouble-promotion -Wno-error=double-promotion)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS
C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall)
Modified: trunk/blender/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim_sys.c 2011-04-03
07:48:33 UTC (rev 35970)
+++ trunk/blender/source/blender/blenkernel/intern/anim_sys.c 2011-04-03
10:04:16 UTC (rev 35971)
@@ -1851,7 +1851,7 @@
* ! This is exported so that keyframing code can use this for make use of it
for anim layers support
* > echannels: (list<NlaEvalChannels>) evaluation channels with calculated
values
*/
-void animsys_evaluate_nla (ListBase *echannels, PointerRNA *ptr, AnimData
*adt, float ctime)
+static void animsys_evaluate_nla (ListBase *echannels, PointerRNA *ptr,
AnimData *adt, float ctime)
{
NlaTrack *nlt;
short track_index=0;
Modified: trunk/blender/source/blender/blenlib/BLI_utildefines.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_utildefines.h 2011-04-03
07:48:33 UTC (rev 35970)
+++ trunk/blender/source/blender/blenlib/BLI_utildefines.h 2011-04-03
10:04:16 UTC (rev 35971)
@@ -206,7 +206,7 @@
# ifdef __GNUC__ /* just want to check if __func__ is available */
# define BLI_assert(a) \
do { \
- if (0 == (a)) { \
+ if (!(a)) { \
fprintf(stderr, \
"BLI_assert failed: %s, %s(), %d at \'%s\'\n", \
__FILE__, __func__, __LINE__, STRINGIFY(a)); \
Modified: trunk/blender/source/blender/editors/interface/interface_icons.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_icons.c
2011-04-03 07:48:33 UTC (rev 35970)
+++ trunk/blender/source/blender/editors/interface/interface_icons.c
2011-04-03 10:04:16 UTC (rev 35971)
@@ -129,7 +129,7 @@
/* ******************* STATIC LOCAL VARS ******************* */
/* static here to cache results of icon directory scan, so it's not
* scanning the filesystem each time the menu is drawn */
-static struct ListBase iconfilelist = {0, 0};
+static struct ListBase iconfilelist = {NULL, NULL};
static IconTexture icongltex = {0, 0, 0, 0.0f, 0.0f};
/* **************************************************** */
@@ -144,7 +144,7 @@
new_icon = MEM_callocN(sizeof(Icon), "texicon");
- new_icon->obj = 0; /* icon is not for library object */
+ new_icon->obj = NULL; /* icon is not for library object */
new_icon->type = 0;
di = MEM_callocN(sizeof(DrawInfo), "drawinfo");
@@ -184,14 +184,14 @@
new_icon = MEM_callocN(sizeof(Icon), "texicon");
- new_icon->obj = 0; /* icon is not for library object */
+ new_icon->obj = NULL; /* icon is not for library object */
new_icon->type = 0;
di = MEM_callocN(sizeof(DrawInfo), "drawinfo");
di->type= ICON_TYPE_VECTOR;
di->data.vector.func =drawFunc;
- new_icon->drawinfo_free = 0;
+ new_icon->drawinfo_free = NULL;
new_icon->drawinfo = di;
BKE_icon_set(icon_id, new_icon);
@@ -667,7 +667,7 @@
if (dir[i].string) MEM_freeN(dir[i].string);
}
free(dir);
- dir= 0;
+ dir= NULL;
}
static void free_iconfile_list(struct ListBase *list)
Modified: trunk/blender/source/blender/editors/physics/physics_fluid.c
===================================================================
--- trunk/blender/source/blender/editors/physics/physics_fluid.c
2011-04-03 07:48:33 UTC (rev 35970)
+++ trunk/blender/source/blender/editors/physics/physics_fluid.c
2011-04-03 10:04:16 UTC (rev 35971)
@@ -809,7 +809,7 @@
}
}
-int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain)
+static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain)
{
Scene *scene= CTX_data_scene(C);
int i;
Modified: trunk/blender/source/blender/editors/space_action/action_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_action/action_ops.c
2011-04-03 07:48:33 UTC (rev 35970)
+++ trunk/blender/source/blender/editors/space_action/action_ops.c
2011-04-03 10:04:16 UTC (rev 35971)
@@ -39,8 +39,7 @@
#include "BLI_blenlib.h"
-
-
+#include "ED_anim_api.h"
#include "ED_transform.h"
#include "action_intern.h"
Modified: trunk/blender/source/blender/editors/space_graph/graph_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_graph/graph_ops.c
2011-04-03 07:48:33 UTC (rev 35970)
+++ trunk/blender/source/blender/editors/space_graph/graph_ops.c
2011-04-03 10:04:16 UTC (rev 35971)
@@ -45,6 +45,7 @@
#include "UI_view2d.h"
+#include "ED_anim_api.h"
#include "ED_screen.h"
#include "ED_transform.h"
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
2011-04-03 07:48:33 UTC (rev 35970)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
2011-04-03 10:04:16 UTC (rev 35971)
@@ -337,7 +337,7 @@
}
seq= seq->next;
}
- return 0;
+ return NULL;
}
@@ -461,12 +461,12 @@
- if(last_seq==0 || last_seq->type!=SEQ_IMAGE) return;
+ if(last_seq==NULL || last_seq->type!=SEQ_IMAGE) return;
seqact= last_seq; /* last_seq changes in alloc_sequence */
/* search sfile */
// sfile= scrarea_find_space_of_type(curarea, SPACE_FILE);
- if(sfile==0) return;
+ if(sfile == NULL) return;
waitcursor(1);
@@ -479,7 +479,7 @@
seqact->len= seq->len;
calc_sequence(scene, seqact);
- seq->strip= 0;
+ seq->strip= NULL;
seq_free_sequence(scene, seq);
BLI_remlink(ed->seqbasep, seq);
@@ -497,7 +497,7 @@
Scene *sce;
short event;
- if(last_seq==0) return;
+ if(last_seq == NULL) return;
if(last_seq->type & SEQ_EFFECT) {
event = pupmenu("Change Effect%t"
@@ -590,7 +590,7 @@
int seq_effect_find_selected(Scene *scene, Sequence *activeseq, int type,
Sequence **selseq1, Sequence **selseq2, Sequence **selseq3, const char
**error_str)
{
Editing *ed = seq_give_editing(scene, FALSE);
- Sequence *seq1= 0, *seq2= 0, *seq3= 0, *seq;
+ Sequence *seq1= NULL, *seq2= NULL, *seq3= NULL, *seq;
*error_str= NULL;
@@ -604,9 +604,9 @@
return 0;
}
if((seq != activeseq) && (seq != seq2)) {
- if(seq2==0)
seq2= seq;
- else
if(seq1==0) seq1= seq;
- else
if(seq3==0) seq3= seq;
+ if(seq2 ==
NULL) seq2= seq;
+ else if(seq1 ==
NULL) seq1= seq;
+ else if(seq3 ==
NULL) seq3= seq;
else {
*error_str= "Can't apply effect to more than 3 sequence strips";
return
0;
@@ -617,7 +617,7 @@
/* make sequence selection a little bit more intuitive
for 3 strips: the last-strip should be sequence3 */
- if (seq3 != 0 && seq2 != 0) {
+ if (seq3 != NULL && seq2 != NULL) {
Sequence *tmp = seq2;
seq2 = seq3;
seq3 = tmp;
@@ -626,21 +626,21 @@
switch(get_sequence_effect_num_inputs(type)) {
case 0:
- *selseq1 = *selseq2 = *selseq3 = 0;
+ *selseq1 = *selseq2 = *selseq3 = NULL;
return 1; /* succsess */
case 1:
- if(seq2==0) {
+ if(seq2==NULL) {
*error_str= "Need at least one selected sequence strip";
return 0;
}
- if(seq1==0) seq1= seq2;
- if(seq3==0) seq3= seq2;
+ if(seq1==NULL) seq1= seq2;
+ if(seq3==NULL) seq3= seq2;
case 2:
- if(seq1==0 || seq2==0) {
+ if(seq1==NULL || seq2==NULL) {
*error_str= "Need 2 selected sequence strips";
return 0;
}
- if(seq3==0) seq3= seq2;
+ if(seq3 == NULL) seq3= seq2;
}
if (seq1==NULL && seq2==NULL && seq3==NULL) {
@@ -722,7 +722,7 @@
static Sequence *cut_seq_hard(Scene *scene, Sequence * seq, int cutframe)
{
TransSeq ts;
- Sequence *seqn = 0;
+ Sequence *seqn = NULL;
int skip_dup = FALSE;
/* backup values */
@@ -816,7 +816,7 @@
static Sequence *cut_seq_soft(Scene *scene, Sequence * seq, int cutframe)
{
TransSeq ts;
- Sequence *seqn = 0;
+ Sequence *seqn = NULL;
int skip_dup = FALSE;
/* backup values */
@@ -2013,8 +2013,8 @@
BLI_movelisttolist(ed->seqbasep, &last_seq->seqbase);
- last_seq->seqbase.first= 0;
- last_seq->seqbase.last= 0;
+ last_seq->seqbase.first= NULL;
+ last_seq->seqbase.last= NULL;
BLI_remlink(ed->seqbasep, last_seq);
seq_free_sequence(scene, last_seq);
Modified:
trunk/blender/source/blender/editors/space_sequencer/sequencer_scopes.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_scopes.c
2011-04-03 07:48:33 UTC (rev 35970)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_scopes.c
2011-04-03 10:04:16 UTC (rev 35971)
@@ -167,7 +167,7 @@
}
for (y = 0; y < ibuf->y; y++) {
- unsigned char * last_p = 0;
+ unsigned char * last_p = NULL;
for (x = 0; x < ibuf->x; x++) {
unsigned char * rgb = src + 4 * (ibuf->x * y + x);
@@ -182,7 +182,7 @@
p += 4 * w;
scope_put_pixel(wtable, p);
- if (last_p != 0) {
+ if (last_p != NULL) {
wform_put_line(w, last_p, p);
}
last_p = p;
@@ -213,7 +213,7 @@
}
for (y = 0; y < ibuf->y; y++) {
- unsigned char * last_p = 0;
+ unsigned char * last_p = NULL;
for (x = 0; x < ibuf->x; x++) {
float * rgb = src + 4 * (ibuf->x * y + x);
@@ -231,7 +231,7 @@
p += 4 * w;
scope_put_pixel(wtable, p);
- if (last_p != 0) {
+ if (last_p != NULL) {
wform_put_line(w, last_p, p);
}
last_p = p;
@@ -274,7 +274,7 @@
}
for (y = 0; y < ibuf->y; y++) {
- unsigned char * last_p[3] = {0,0,0};
+ unsigned char *last_p[3] = {NULL, NULL, NULL};
for (x = 0; x < ibuf->x; x++) {
int c;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
