[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58314] trunk/blender: fix for checking char arrays against NULL, instead check their first character.
Campbell Barton
ideasman42 at gmail.com
Tue Jul 16 13:42:07 CEST 2013
Revision: 58314
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58314
Author: campbellbarton
Date: 2013-07-16 11:42:07 +0000 (Tue, 16 Jul 2013)
Log Message:
-----------
fix for checking char arrays against NULL, instead check their first character. also remove some dead code (return directly after return).
Modified Paths:
--------------
trunk/blender/intern/smoke/CMakeLists.txt
trunk/blender/source/blender/blenkernel/intern/smoke.c
trunk/blender/source/blender/blenlib/intern/fileops.c
trunk/blender/source/blender/editors/include/ED_armature.h
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/editors/render/render_internal.c
trunk/blender/source/blender/editors/space_clip/tracking_ops.c
trunk/blender/source/blender/editors/space_outliner/outliner_select.c
trunk/blender/source/blender/editors/space_outliner/outliner_tree.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
Modified: trunk/blender/intern/smoke/CMakeLists.txt
===================================================================
--- trunk/blender/intern/smoke/CMakeLists.txt 2013-07-16 11:39:48 UTC (rev 58313)
+++ trunk/blender/intern/smoke/CMakeLists.txt 2013-07-16 11:42:07 UTC (rev 58314)
@@ -95,7 +95,7 @@
if(WITH_FFTW3)
add_definitions(-DWITH_FFTW3)
- list(APPEND INC
+ list(APPEND INC_SYS
${FFTW3_INCLUDE_DIRS}
)
endif()
Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/smoke.c 2013-07-16 11:39:48 UTC (rev 58313)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c 2013-07-16 11:42:07 UTC (rev 58314)
@@ -2102,7 +2102,7 @@
/* sample subframes */
else {
int scene_frame = scene->r.cfra;
- float scene_subframe = scene->r.subframe;
+ // float scene_subframe = scene->r.subframe; // UNUSED
int subframe;
for (subframe = 0; subframe <= subframes; subframe++) {
EmissionMap em_temp = {0};
Modified: trunk/blender/source/blender/blenlib/intern/fileops.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/fileops.c 2013-07-16 11:39:48 UTC (rev 58313)
+++ trunk/blender/source/blender/blenlib/intern/fileops.c 2013-07-16 11:42:07 UTC (rev 58314)
@@ -199,7 +199,7 @@
{
FILE *f = BLI_fopen(file, "r+b");
if (f != NULL) {
- char c = getc(f);
+ int c = getc(f);
rewind(f);
putc(c, f);
}
Modified: trunk/blender/source/blender/editors/include/ED_armature.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_armature.h 2013-07-16 11:39:48 UTC (rev 58313)
+++ trunk/blender/source/blender/editors/include/ED_armature.h 2013-07-16 11:42:07 UTC (rev 58314)
@@ -155,7 +155,7 @@
/* low level selection functions which handle */
int ED_armature_ebone_selectflag_get(const EditBone *ebone);
-void ED_armature_ebone_selectflag_set(EditBone *ebone, const int flag);
+void ED_armature_ebone_selectflag_set(EditBone *ebone, int flag);
void ED_armature_ebone_select_set(EditBone *ebone, bool select);
void ED_armature_ebone_selectflag_enable(EditBone *ebone, int flag);
void ED_armature_ebone_selectflag_disable(EditBone *ebone, int flag);
Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c 2013-07-16 11:39:48 UTC (rev 58313)
+++ trunk/blender/source/blender/editors/object/object_add.c 2013-07-16 11:42:07 UTC (rev 58314)
@@ -226,7 +226,7 @@
return dia;
}
- return 1.0f;
+ // return 1.0f;
}
/********************* Add Object Operator ********************/
Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c 2013-07-16 11:39:48 UTC (rev 58313)
+++ trunk/blender/source/blender/editors/render/render_internal.c 2013-07-16 11:42:07 UTC (rev 58314)
@@ -831,9 +831,10 @@
RenderPreview *rp = rjp;
/* during render, rv3d->engine can get freed */
- if (rp->rv3d->render_engine == NULL)
+ if (rp->rv3d->render_engine == NULL) {
*rp->stop = 1;
- else if (rp->engine->text) {
+ }
+ else if (rp->engine->text[0]) {
make_renderinfo_string(rs, rp->scene, false, rp->engine->text);
/* make jobs timer to send notifier */
Modified: trunk/blender/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/tracking_ops.c 2013-07-16 11:39:48 UTC (rev 58313)
+++ trunk/blender/source/blender/editors/space_clip/tracking_ops.c 2013-07-16 11:42:07 UTC (rev 58314)
@@ -420,7 +420,6 @@
float padding, int width, int height)
{
const float size = 12.0f;
- int inside = 0;
float min[2], max[2];
float dx, dy;
@@ -445,8 +444,6 @@
return IN_RANGE_INCL(co[0], slide_zone[0] - dx, slide_zone[0] + dx) &&
IN_RANGE_INCL(co[1], slide_zone[1] - dy, slide_zone[1] + dy);
-
- return inside;
}
static int mouse_on_corner(SpaceClip *sc, MovieTrackingMarker *marker,
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_select.c 2013-07-16 11:39:48 UTC (rev 58313)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_select.c 2013-07-16 11:42:07 UTC (rev 58314)
@@ -704,7 +704,7 @@
// XXX select_single_seq(seq, 1);
p = ed->seqbasep->first;
while (p) {
- if ((!p->strip) || (!p->strip->stripdata) || (!p->strip->stripdata->name)) {
+ if ((!p->strip) || (!p->strip->stripdata) || (p->strip->stripdata->name[0] == '\0')) {
p = p->next;
continue;
}
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_tree.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_tree.c 2013-07-16 11:39:48 UTC (rev 58313)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_tree.c 2013-07-16 11:42:07 UTC (rev 58314)
@@ -957,7 +957,7 @@
else if (type == TSE_SEQ_STRIP) {
Strip *strip = (Strip *)idv;
- if (strip->dir)
+ if (strip->dir[0] != '\0')
te->name = strip->dir;
else
te->name = IFACE_("Strip None");
@@ -1171,7 +1171,7 @@
p = seq;
while (p) {
- if ((!p->strip) || (!p->strip->stripdata) || (!p->strip->stripdata->name)) {
+ if ((!p->strip) || (!p->strip->stripdata) || (p->strip->stripdata->name[0] == '\0')) {
p = p->next;
continue;
}
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c 2013-07-16 11:39:48 UTC (rev 58313)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c 2013-07-16 11:42:07 UTC (rev 58314)
@@ -551,6 +551,7 @@
}
if (seq1 == NULL) seq1 = seq2;
if (seq3 == NULL) seq3 = seq2;
+ /* fall-through */
case 2:
if (seq1 == NULL || seq2 == NULL) {
*error_str = N_("2 selected sequence strips are needed");
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2013-07-16 11:39:48 UTC (rev 58313)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2013-07-16 11:42:07 UTC (rev 58314)
@@ -3033,7 +3033,7 @@
{
float fill_color[4] = {0.0f, 0.0f, 0.0f, 0.25f};
- if (!rv3d->render_engine || !rv3d->render_engine->text)
+ if (!rv3d->render_engine || !rv3d->render_engine->text[0])
return;
if (render_border) {
More information about the Bf-blender-cvs
mailing list