diff options
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/interface/interface_icons.c | 2 | ||||
-rw-r--r-- | source/blender/editors/physics/particle_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_file/space_file.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_text/text_draw.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_time/time_ops.c | 10 |
5 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 7be153e942e..9093b965939 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -1342,7 +1342,7 @@ static int ui_id_brush_get_icon(const bContext *C, ID *id) Object *ob = CTX_data_active_object(C); SpaceImage *sima; EnumPropertyItem *items = NULL; - int tool, mode = 0; + int tool = PAINT_TOOL_DRAW, mode = 0; /* XXX: this is not nice, should probably make brushes * be strictly in one paint mode only to avoid diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index d20688693e1..b8ff2721717 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -102,7 +102,7 @@ void update_world_cos(Object *ob, PTCacheEdit *edit); #define LOOP_SELECTED_KEYS for (k=0, key=point->keys; k<point->totkey; k++, key++) if ((key->flag & PEK_SELECT) && !(key->flag & PEK_HIDE)) #define LOOP_TAGGED_KEYS for (k=0, key=point->keys; k<point->totkey; k++, key++) if (key->flag & PEK_TAG) -#define KEY_WCO (key->flag & PEK_USE_WCO ? key->world_co : key->co) +#define KEY_WCO ((key->flag & PEK_USE_WCO) ? key->world_co : key->co) /**************************** utilities *******************************/ diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c index e77f545fbc0..7fb294529c9 100644 --- a/source/blender/editors/space_file/space_file.c +++ b/source/blender/editors/space_file/space_file.c @@ -225,7 +225,7 @@ static void file_refresh(const bContext *C, ScrArea *sa) filelist_setsorting(sfile->files, params->sort); filelist_setfilter_options(sfile->files, (params->flag & FILE_HIDE_DOT) != 0, false, /* TODO hide_parent, should be controllable? */ - params->flag & FILE_FILTER ? params->filter : 0, + (params->flag & FILE_FILTER) ? params->filter : 0, params->filter_id, params->filter_glob, params->filter_search); diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c index 9448f6af69f..81605a80f69 100644 --- a/source/blender/editors/space_text/text_draw.c +++ b/source/blender/editors/space_text/text_draw.c @@ -1009,7 +1009,7 @@ static void draw_documentation(const SpaceText *st, ARegion *ar) if (lines >= DOC_HEIGHT) break; } - if (0 /* XXX doc_scroll*/ > 0 && lines < DOC_HEIGHT) { + if (0 /* XXX doc_scroll*/ /* > 0 && lines < DOC_HEIGHT */) { // XXX doc_scroll--; draw_documentation(st, ar); } diff --git a/source/blender/editors/space_time/time_ops.c b/source/blender/editors/space_time/time_ops.c index a7f549b65ae..7dd45327352 100644 --- a/source/blender/editors/space_time/time_ops.c +++ b/source/blender/editors/space_time/time_ops.c @@ -141,18 +141,18 @@ static int time_view_all_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); ARegion *ar = CTX_wm_region(C); - View2D *v2d = (ar) ? &ar->v2d : NULL; - float extra; - + if (ELEM(NULL, scene, ar)) return OPERATOR_CANCELLED; - + + View2D *v2d = &ar->v2d; + /* set extents of view to start/end frames (Preview Range too) */ v2d->cur.xmin = (float)PSFRA; v2d->cur.xmax = (float)PEFRA; /* we need an extra "buffer" factor on either side so that the endpoints are visible */ - extra = 0.01f * BLI_rctf_size_x(&v2d->cur); + const float extra = 0.01f * BLI_rctf_size_x(&v2d->cur); v2d->cur.xmin -= extra; v2d->cur.xmax += extra; |