[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58215] trunk/blender/source/blender: remove NULL checks on fixed size arrays, also was calling BLI_testextensie_glob every time in the file selector with a blank string .
Campbell Barton
ideasman42 at gmail.com
Sat Jul 13 16:17:00 CEST 2013
Revision: 58215
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58215
Author: campbellbarton
Date: 2013-07-13 14:16:59 +0000 (Sat, 13 Jul 2013)
Log Message:
-----------
remove NULL checks on fixed size arrays, also was calling BLI_testextensie_glob every time in the file selector with a blank string.
Modified Paths:
--------------
trunk/blender/source/blender/blenloader/intern/versioning_legacy.c
trunk/blender/source/blender/editors/animation/anim_markers.c
trunk/blender/source/blender/editors/interface/interface_regions.c
trunk/blender/source/blender/editors/space_file/filelist.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
trunk/blender/source/blender/imbuf/intern/colormanagement.c
trunk/blender/source/blender/modifiers/intern/MOD_screw.c
Modified: trunk/blender/source/blender/blenloader/intern/versioning_legacy.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/versioning_legacy.c 2013-07-13 12:58:00 UTC (rev 58214)
+++ trunk/blender/source/blender/blenloader/intern/versioning_legacy.c 2013-07-13 14:16:59 UTC (rev 58215)
@@ -354,7 +354,7 @@
ma = NULL;
for (b = 0; ma && b < MAX_MTEX; b++)
- if (ma->mtex && ma->mtex[b] && ma->mtex[b]->mapto & MAP_ALPHA)
+ if (ma->mtex[b] && ma->mtex[b]->mapto & MAP_ALPHA)
texalpha = 1;
}
else {
Modified: trunk/blender/source/blender/editors/animation/anim_markers.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_markers.c 2013-07-13 12:58:00 UTC (rev 58214)
+++ trunk/blender/source/blender/editors/animation/anim_markers.c 2013-07-13 14:16:59 UTC (rev 58215)
@@ -401,7 +401,7 @@
glDisable(GL_BLEND);
/* and the marker name too, shifted slightly to the top-right */
- if (marker->name && marker->name[0]) {
+ if (marker->name[0]) {
float x, y;
/* minimal y coordinate which wouldn't be occluded by scroll */
Modified: trunk/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_regions.c 2013-07-13 12:58:00 UTC (rev 58214)
+++ trunk/blender/source/blender/editors/interface/interface_regions.c 2013-07-13 14:16:59 UTC (rev 58215)
@@ -524,7 +524,7 @@
if (but->rnapoin.id.data) {
ID *id = but->rnapoin.id.data;
- if (id->lib && id->lib->name) {
+ if (id->lib) {
BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), TIP_("Library: %s"), id->lib->name);
data->color_id[data->totline] = UI_TIP_LC_NORMAL;
data->totline++;
Modified: trunk/blender/source/blender/editors/space_file/filelist.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/filelist.c 2013-07-13 12:58:00 UTC (rev 58214)
+++ trunk/blender/source/blender/editors/space_file/filelist.c 2013-07-13 14:16:59 UTC (rev 58215)
@@ -847,7 +847,7 @@
}
file->flags = file_extension_type(file->relname);
- if (filelist->filter_glob &&
+ if (filelist->filter_glob[0] &&
BLI_testextensie_glob(file->relname, filelist->filter_glob))
{
file->flags = OPERATORFILE;
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c 2013-07-13 12:58:00 UTC (rev 58214)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c 2013-07-13 14:16:59 UTC (rev 58215)
@@ -162,12 +162,7 @@
break;
case SEQ_TYPE_COLOR:
- if (colvars->col) {
- rgb_float_to_uchar(col, colvars->col);
- }
- else {
- col[0] = col[1] = col[2] = 128;
- }
+ rgb_float_to_uchar(col, colvars->col);
break;
case SEQ_TYPE_SOUND_RAM:
Modified: trunk/blender/source/blender/imbuf/intern/colormanagement.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/colormanagement.c 2013-07-13 12:58:00 UTC (rev 58214)
+++ trunk/blender/source/blender/imbuf/intern/colormanagement.c 2013-07-13 14:16:59 UTC (rev 58215)
@@ -2448,12 +2448,8 @@
item.name = colorspace->name;
item.identifier = colorspace->name;
item.icon = 0;
+ item.description = colorspace->description;
- if (colorspace->description)
- item.description = colorspace->description;
- else
- item.description = "";
-
RNA_enum_item_add(items, totitem, &item);
}
}
Modified: trunk/blender/source/blender/modifiers/intern/MOD_screw.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_screw.c 2013-07-13 12:58:00 UTC (rev 58214)
+++ trunk/blender/source/blender/modifiers/intern/MOD_screw.c 2013-07-13 14:16:59 UTC (rev 58215)
@@ -636,7 +636,7 @@
*
* Use the edge order to make the subtraction, flip the normal the right way
* edge should be there but check just in case... */
- if (vc->e && vc->e[0]->v1 == i) {
+ if (vc->e[0]->v1 == i) {
sub_v3_v3(tmp_vec1, tmp_vec2);
}
else {
More information about the Bf-blender-cvs
mailing list