Revision: 38751
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38751
Author: campbellbarton
Date: 2011-07-27 06:55:20 +0000 (Wed, 27 Jul 2011)
Log Message:
-----------
more minor warning cleanups and improve error reporting if text fails to save.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/blenkernel/intern/text.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/space_node/node_draw.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c
trunk/blender/source/blender/editors/space_text/text_ops.c
trunk/blender/source/blender/gpu/intern/gpu_material.c
Modified: trunk/blender/source/blender/blenkernel/intern/seqeffects.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2011-07-27
03:19:21 UTC (rev 38750)
+++ trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2011-07-27
06:55:20 UTC (rev 38751)
@@ -2373,7 +2373,7 @@
/* Blancmange ([email protected]) */
k = -1.0f/(2.0f*(float)M_PI*blur*blur);
- fval=0;
+
for (ix = 0;ix< halfWidth;ix++){
weight = (float)exp(k*(ix*ix));
filter[halfWidth - ix] = weight;
Modified: trunk/blender/source/blender/blenkernel/intern/text.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/text.c 2011-07-27
03:19:21 UTC (rev 38750)
+++ trunk/blender/source/blender/blenkernel/intern/text.c 2011-07-27
06:55:20 UTC (rev 38751)
@@ -1423,6 +1423,8 @@
}
undoing= u;
+
+ (void)count;
}
/******************/
Modified: trunk/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature.c
2011-07-27 03:19:21 UTC (rev 38750)
+++ trunk/blender/source/blender/editors/armature/editarmature.c
2011-07-27 06:55:20 UTC (rev 38751)
@@ -1478,10 +1478,8 @@
bArmature *arm;
EditBone *bone, *curBone, *next;
int extend= RNA_boolean_get(op->ptr, "extend");
- ARegion *ar;
Object *obedit= CTX_data_edit_object(C);
arm= obedit->data;
- ar= CTX_wm_region(C);
view3d_operator_needs_opengl(C);
Modified: trunk/blender/source/blender/editors/space_node/node_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_draw.c 2011-07-27
03:19:21 UTC (rev 38750)
+++ trunk/blender/source/blender/editors/space_node/node_draw.c 2011-07-27
06:55:20 UTC (rev 38751)
@@ -781,14 +781,15 @@
iconbutw, UI_UNIT_Y, NULL, 0.0, 0.0,
1.0, 0.5, "");
}
{ /* always hide/reveal unused sockets */
- int shade;
+ // XXX re-enable
+ /* int shade;
+ if(node_has_hidden_sockets(node))
+ shade= -40;
+ else
+ shade= -90; */
iconofs-=iconbutw;
- // XXX re-enable
- /*if(node_has_hidden_sockets(node))
- shade= -40;
- else*/
- shade= -90;
+
uiDefIconBut(node->block, LABEL, B_REDR, ICON_PLUS, iconofs,
rct->ymax-NODE_DY,
iconbutw, UI_UNIT_Y, NULL,
0.0, 0.0, 1.0, 0.5, "");
}
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c
2011-07-27 03:19:21 UTC (rev 38750)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c
2011-07-27 06:55:20 UTC (rev 38751)
@@ -303,7 +303,7 @@
Scene *scene= CTX_data_scene(C); /* only for sound */
Editing *ed= seq_give_editing(scene, TRUE);
SeqLoadInfo seq_load;
- Sequence *seq;
+ /* Sequence *seq; */ /* UNUSED */
int tot_files;
seq_load_operator_info(&seq_load, op);
@@ -324,13 +324,13 @@
RNA_string_get(&itemptr, "name", file_only);
BLI_join_dirfile(seq_load.path, sizeof(seq_load.path),
dir_only, file_only);
- seq= seq_load_func(C, ed->seqbasep, &seq_load);
+ /* seq= */ seq_load_func(C, ed->seqbasep, &seq_load);
}
RNA_END;
}
else {
/* single file */
- seq= seq_load_func(C, ed->seqbasep, &seq_load);
+ /* seq= */ seq_load_func(C, ed->seqbasep, &seq_load);
}
if (seq_load.tot_success==0) {
Modified: trunk/blender/source/blender/editors/space_text/text_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_ops.c 2011-07-27
03:19:21 UTC (rev 38750)
+++ trunk/blender/source/blender/editors/space_text/text_ops.c 2011-07-27
06:55:20 UTC (rev 38751)
@@ -36,6 +36,7 @@
#include <string.h>
#include <ctype.h> /* ispunct */
#include <sys/stat.h>
+#include <errno.h>
#include "MEM_guardedalloc.h"
@@ -449,15 +450,14 @@
FILE *fp;
TextLine *tmp;
struct stat st;
- int res;
- char file[FILE_MAXDIR+FILE_MAXFILE];
+ char filepath[FILE_MAXDIR+FILE_MAXFILE];
- BLI_strncpy(file, text->name, FILE_MAXDIR+FILE_MAXFILE);
- BLI_path_abs(file, G.main->name);
+ BLI_strncpy(filepath, text->name, FILE_MAXDIR+FILE_MAXFILE);
+ BLI_path_abs(filepath, G.main->name);
- fp= fopen(file, "w");
+ fp= fopen(filepath, "w");
if(fp==NULL) {
- BKE_report(reports, RPT_ERROR, "Unable to save file.");
+ BKE_reportf(reports, RPT_ERROR, "Unable to save \"%s\": %s.",
filepath, errno ? strerror(errno) : "Unknown error writing file");
return;
}
@@ -471,8 +471,13 @@
fclose (fp);
- res= stat(file, &st);
- text->mtime= st.st_mtime;
+ if(stat(filepath, &st) == 0) {
+ text->mtime= st.st_mtime;
+ }
+ else {
+ text->mtime= 0;
+ BKE_reportf(reports, RPT_WARNING, "Unable to stat \"%s\": %s.",
filepath, errno ? strerror(errno) : "Unknown error starrng file");
+ }
if(text->flags & TXT_ISDIRTY)
text->flags ^= TXT_ISDIRTY;
Modified: trunk/blender/source/blender/gpu/intern/gpu_material.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_material.c 2011-07-27
03:19:21 UTC (rev 38750)
+++ trunk/blender/source/blender/gpu/intern/gpu_material.c 2011-07-27
06:55:20 UTC (rev 38751)
@@ -671,7 +671,7 @@
i = is;
GPU_link(mat, "shade_visifac", i, visifac, shi->refl, &i);
- vn = shi->vn;
+
/*if(ma->mode & MA_TANGENT_VN)
GPU_link(mat, "shade_tangent_v_spec", GPU_attribute(CD_TANGENT,
""), &vn);*/
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
