diff options
| -rw-r--r-- | build_files/cmake/config/blender_full.cmake | 2 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_TimerManager.cpp | 1 | ||||
| -rw-r--r-- | source/blender/collada/collada.cpp | 5 | ||||
| -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 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_extensions.c | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_actuator.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 6 |
11 files changed, 18 insertions, 20 deletions
diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake index df8ed881d96..b50b42416fb 100644 --- a/build_files/cmake/config/blender_full.cmake +++ b/build_files/cmake/config/blender_full.cmake @@ -54,7 +54,7 @@ set(WITH_PLAYER ON CACHE BOOL "" FORCE) set(WITH_MEM_JEMALLOC ON CACHE BOOL "" FORCE) -# platform dependant options +# platform dependent options if(UNIX AND NOT APPLE) set(WITH_JACK ON CACHE BOOL "" FORCE) set(WITH_DOC_MANPAGE ON CACHE BOOL "" FORCE) diff --git a/intern/ghost/intern/GHOST_TimerManager.cpp b/intern/ghost/intern/GHOST_TimerManager.cpp index 8cba0608f2b..f6ec9d3febe 100644 --- a/intern/ghost/intern/GHOST_TimerManager.cpp +++ b/intern/ghost/intern/GHOST_TimerManager.cpp @@ -90,7 +90,6 @@ GHOST_TSuccess GHOST_TimerManager::removeTimer(GHOST_TimerTask *timer) // Remove the timer task m_timers.erase(iter); delete timer; - timer = NULL; success = GHOST_kSuccess; } else { diff --git a/source/blender/collada/collada.cpp b/source/blender/collada/collada.cpp index b1cbc01a9a6..b64b10e0833 100644 --- a/source/blender/collada/collada.cpp +++ b/source/blender/collada/collada.cpp @@ -118,12 +118,11 @@ int collada_export(Scene *sce, export_settings.export_set = BKE_object_relational_superset(sce, objectSet, (eObRelationTypes)includeFilter); int export_count = BLI_linklist_count(export_settings.export_set); - if (export_count==0) - { + if (export_count == 0) { if (export_settings.selected) { fprintf(stderr, "Collada: Found no objects to export.\nPlease ensure that all objects which shall be exported are also visible in the 3D Viewport.\n"); } - else{ + else { fprintf(stderr, "Collada: Your scene seems to be empty. No Objects will be exported.\n"); } } 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; diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c index 7d433a78411..3c96b628cd6 100644 --- a/source/blender/gpu/intern/gpu_extensions.c +++ b/source/blender/gpu/intern/gpu_extensions.c @@ -259,8 +259,8 @@ bool GPU_legacy_support(void) if (G.debug & G_DEBUG_GPU) { printf("GL_CONTEXT_PROFILE_MASK = %#x (%s profile)\n", (unsigned int)profile, - profile & GL_CONTEXT_COMPATIBILITY_PROFILE_BIT ? "compatibility" : - profile & GL_CONTEXT_CORE_PROFILE_BIT ? "core" : "unknown"); + (profile & GL_CONTEXT_COMPATIBILITY_PROFILE_BIT) ? "compatibility" : + (profile & GL_CONTEXT_CORE_PROFILE_BIT) ? "core" : "unknown"); } if (profile == 0) { diff --git a/source/blender/makesrna/intern/rna_actuator.c b/source/blender/makesrna/intern/rna_actuator.c index b425a454d33..a09853eaddc 100644 --- a/source/blender/makesrna/intern/rna_actuator.c +++ b/source/blender/makesrna/intern/rna_actuator.c @@ -333,7 +333,7 @@ static void rna_Actuator_constraint_detect_material_set(struct PointerRNA *ptr, bActuator *act = (bActuator *)ptr->data; bConstraintActuator *ca = act->data; - short old_value = (ca->flag & ACT_CONST_MATERIAL ? 1 : 0); + short old_value = (ca->flag & ACT_CONST_MATERIAL) ? 1 : 0; if (old_value != value) { ca->flag ^= ACT_CONST_MATERIAL; diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 99b65b92f70..9ebef9db454 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -301,7 +301,7 @@ static void rna_Object_select_update(Main *UNUSED(bmain), Scene *scene, PointerR { if (scene) { Object *ob = (Object *)ptr->id.data; - short mode = ob->flag & SELECT ? BA_SELECT : BA_DESELECT; + short mode = (ob->flag & SELECT) ? BA_SELECT : BA_DESELECT; ED_base_object_select(BKE_scene_base_find(scene, ob), mode); } } @@ -309,7 +309,7 @@ static void rna_Object_select_update(Main *UNUSED(bmain), Scene *scene, PointerR static void rna_Base_select_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { Base *base = (Base *)ptr->data; - short mode = base->flag & BA_SELECT ? BA_SELECT : BA_DESELECT; + short mode = (base->flag & BA_SELECT) ? BA_SELECT : BA_DESELECT; ED_base_object_select(base, mode); } @@ -1134,7 +1134,7 @@ static void rna_GameObjectSettings_state_get(PointerRNA *ptr, int *values) { Object *ob = (Object *)ptr->data; int i; - int all_states = (ob->scaflag & OB_ALLSTATE ? 1 : 0); + int all_states = (ob->scaflag & OB_ALLSTATE) ? 1 : 0; memset(values, 0, sizeof(int) * OB_MAX_STATES); for (i = 0; i < OB_MAX_STATES; i++) { |