Revision: 43575
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43575
Author: campbellbarton
Date: 2012-01-20 23:03:41 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
quiet warnings and possible NULL checking crash fix for indentation functions.
Modified Paths:
--------------
trunk/blender/build_files/cmake/cmake_static_check_cppcheck.py
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenkernel/intern/movieclip.c
trunk/blender/source/blender/blenkernel/intern/text.c
trunk/blender/source/blender/blenlib/intern/math_rotation.c
trunk/blender/source/blender/editors/armature/editarmature_retarget.c
trunk/blender/source/blender/editors/space_buttons/buttons_context.c
trunk/blender/source/blender/editors/space_script/script_edit.c
trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
trunk/blender/source/blender/makesdna/DNA_sequence_types.h
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
Modified: trunk/blender/build_files/cmake/cmake_static_check_cppcheck.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_static_check_cppcheck.py
2012-01-20 22:32:47 UTC (rev 43574)
+++ trunk/blender/build_files/cmake/cmake_static_check_cppcheck.py
2012-01-20 23:03:41 UTC (rev 43575)
@@ -37,7 +37,8 @@
CHECKER_ARGS = [
# not sure why this is needed, but it is.
"-I" + os.path.join(project_source_info.SOURCE_DIR, "extern", "glew",
"include"),
-
+ "--suppress=*:%s/extern/glew/include/GL/glew.h:241" %
project_source_info.SOURCE_DIR,
+ # "--max-configs=1", # speeds up execution
# "--check-config", # when includes are missing
# "--enable=all", # if you want sixty hundred pedantic suggestions
]
Modified: trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
2012-01-20 22:32:47 UTC (rev 43574)
+++ trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
2012-01-20 23:03:41 UTC (rev 43575)
@@ -188,12 +188,13 @@
Vec3f *barycentricWeights; /* b-weights for all pixel
samples */
} ImgSeqFormatData;
+#if 0 /* UNUSED */
typedef struct EffVelPoint {
float previous_pos[3];
float previous_vel[3];
} EffVelPoint;
+#endif
-
/* adjacency data flags */
#define ADJ_ON_MESH_EDGE (1<<0)
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2012-01-20
22:32:47 UTC (rev 43574)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2012-01-20
23:03:41 UTC (rev 43575)
@@ -1111,9 +1111,9 @@
if(BLI_testextensie_array(string, imb_ext_image)
|| (G.have_quicktime &&
BLI_testextensie_array(string, imb_ext_image_qt))) {
return BLI_replace_extension(string, FILE_MAX,
extension);
- } else {
+ }
+ else {
return BLI_ensure_extension(string, FILE_MAX,
extension);
- return TRUE;
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-01-20
22:32:47 UTC (rev 43574)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-01-20
23:03:41 UTC (rev 43575)
@@ -1292,11 +1292,11 @@
{
int i, numVerts = me->totvert;
float (*cos)[3] = MEM_mallocN(sizeof(*cos)*numVerts, "vertexcos1");
-
+
if (numVerts_r) *numVerts_r = numVerts;
for (i=0; i<numVerts; i++)
copy_v3_v3(cos[i], me->mvert[i].co);
-
+
return cos;
}
Modified: trunk/blender/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/movieclip.c 2012-01-20
22:32:47 UTC (rev 43574)
+++ trunk/blender/source/blender/blenkernel/intern/movieclip.c 2012-01-20
23:03:41 UTC (rev 43575)
@@ -981,7 +981,7 @@
{
char name[FILE_MAX];
int quality, rectx, recty;
- int size= size= rendersize_to_number(proxy_render_size);
+ int size= rendersize_to_number(proxy_render_size);
ImBuf *scaleibuf;
get_proxy_fname(clip, proxy_render_size, undistorted, cfra, name);
Modified: trunk/blender/source/blender/blenkernel/intern/text.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/text.c 2012-01-20
22:32:47 UTC (rev 43574)
+++ trunk/blender/source/blender/blenkernel/intern/text.c 2012-01-20
23:03:41 UTC (rev 43575)
@@ -2751,15 +2751,19 @@
/* hardcoded: TXT_TABSIZE = 4 spaces: */
int spaceslen = TXT_TABSIZE;
+ if (ELEM3(NULL, text, text->curl, text->sell)) {
+ return;
+ }
+
+ if (!text) return;
+ if (!text->curl) return;
+ if (!text->sell) return;
+
/* insert spaces rather than tabs */
if (text->flags & TXT_TABSTOSPACES){
add = tab_to_spaces;
indentlen = spaceslen;
}
-
- if (!text) return;
- if (!text->curl) return;
- if (!text->sell) return;
num = 0;
while (TRUE)
@@ -2812,16 +2816,16 @@
/* hardcoded: TXT_TABSIZE = 4 spaces: */
int spaceslen = TXT_TABSIZE;
+ if (!text) return;
+ if (!text->curl) return;
+ if (!text->sell) return;
+
/* insert spaces rather than tabs */
if (text->flags & TXT_TABSTOSPACES){
remove = tab_to_spaces;
indent = spaceslen;
}
- if (!text) return;
- if (!text->curl) return;
- if (!text->sell) return;
-
while(TRUE)
{
int i = 0;
Modified: trunk/blender/source/blender/blenlib/intern/math_rotation.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_rotation.c 2012-01-20
22:32:47 UTC (rev 43574)
+++ trunk/blender/source/blender/blenlib/intern/math_rotation.c 2012-01-20
23:03:41 UTC (rev 43575)
@@ -811,7 +811,7 @@
mat[2][2] = 1.0f;
break;
default:
- assert("invalid axis");
+ assert(0);
}
}
Modified: trunk/blender/source/blender/editors/armature/editarmature_retarget.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature_retarget.c
2012-01-20 22:32:47 UTC (rev 43574)
+++ trunk/blender/source/blender/editors/armature/editarmature_retarget.c
2012-01-20 23:03:41 UTC (rev 43575)
@@ -450,7 +450,7 @@
{
int i, j;
- for (i = 0, j = 0; template_name[i] != '\0' && i < (MAXBONENAME-1) && j
< (MAXBONENAME-1); i++)
+ for (i = 0, j = 0; i < (MAXBONENAME-1) && j < (MAXBONENAME-1) &&
template_name[i] != '\0'; i++)
{
if (template_name[i] == '&')
{
Modified: trunk/blender/source/blender/editors/space_buttons/buttons_context.c
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/buttons_context.c
2012-01-20 22:32:47 UTC (rev 43574)
+++ trunk/blender/source/blender/editors/space_buttons/buttons_context.c
2012-01-20 23:03:41 UTC (rev 43575)
@@ -1061,7 +1061,6 @@
if(ptr->id.data) {
return ptr->id.data;
- break;
}
}
}
Modified: trunk/blender/source/blender/editors/space_script/script_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_script/script_edit.c
2012-01-20 22:32:47 UTC (rev 43574)
+++ trunk/blender/source/blender/editors/space_script/script_edit.c
2012-01-20 23:03:41 UTC (rev 43575)
@@ -96,8 +96,8 @@
return OPERATOR_FINISHED;
#else
(void)C; /* unused */
+ return OPERATOR_CANCELLED;
#endif
- return OPERATOR_CANCELLED;
}
void SCRIPT_OT_reload(wmOperatorType *ot)
Modified: trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
2012-01-20 22:32:47 UTC (rev 43574)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
2012-01-20 23:03:41 UTC (rev 43575)
@@ -912,12 +912,13 @@
}
}
-static void stitch_calculate_edge_normal(EditMesh *em, UvEdge *edge, float
*normal){
+static void stitch_calculate_edge_normal(EditMesh *em, UvEdge *edge, float
*normal)
+{
UvElement *element = edge->element;
EditFace *efa = element->face;
MTFace *mt = CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
int nverts = efa->v4?4 : 3;
- int index = index = (element->tfindex + 2)%nverts;
+ int index = (element->tfindex + 2)%nverts;
float tangent[2], internal[2];
sub_v2_v2v2(tangent, mt->uv[(element->tfindex + 1)%nverts],
mt->uv[element->tfindex]);
Modified: trunk/blender/source/blender/makesdna/DNA_sequence_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_sequence_types.h 2012-01-20
22:32:47 UTC (rev 43574)
+++ trunk/blender/source/blender/makesdna/DNA_sequence_types.h 2012-01-20
23:03:41 UTC (rev 43575)
@@ -353,7 +353,7 @@
*/
-#define SEQ_HAS_PATH(_seq) (ELEM5((_seq)->type, SEQ_MOVIE, SEQ_IMAGE,
SEQ_SOUND, SEQ_RAM_SOUND, SEQ_HD_SOUND))
+#define SEQ_HAS_PATH(_seq) (ELEM4((_seq)->type, SEQ_MOVIE, SEQ_IMAGE,
SEQ_RAM_SOUND, SEQ_HD_SOUND))
#endif
Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2012-01-20
22:32:47 UTC (rev 43574)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2012-01-20
23:03:41 UTC (rev 43575)
@@ -3071,7 +3071,7 @@
};
#undef SUBTYPE
- #define SUBTYPE(socktype, stypename, id, idname) if
(subtype==PROP_##id) propsubtype = PROP_##id;
+ #define SUBTYPE(socktype, stypename, id, idname) if (subtype ==
(PROP_##id)) propsubtype = PROP_##id;
NODE_DEFINE_SUBTYPES
#undef SUBTYPE
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
