forked from bartvdbraak/blender
Cleanup: warnings. spelling
This commit is contained in:
parent
461604c0d5
commit
ac163447f8
@ -54,7 +54,7 @@ set(WITH_PLAYER ON CACHE BOOL "" FORCE)
|
|||||||
set(WITH_MEM_JEMALLOC ON CACHE BOOL "" FORCE)
|
set(WITH_MEM_JEMALLOC ON CACHE BOOL "" FORCE)
|
||||||
|
|
||||||
|
|
||||||
# platform dependant options
|
# platform dependent options
|
||||||
if(UNIX AND NOT APPLE)
|
if(UNIX AND NOT APPLE)
|
||||||
set(WITH_JACK ON CACHE BOOL "" FORCE)
|
set(WITH_JACK ON CACHE BOOL "" FORCE)
|
||||||
set(WITH_DOC_MANPAGE ON CACHE BOOL "" FORCE)
|
set(WITH_DOC_MANPAGE ON CACHE BOOL "" FORCE)
|
||||||
|
@ -90,7 +90,6 @@ GHOST_TSuccess GHOST_TimerManager::removeTimer(GHOST_TimerTask *timer)
|
|||||||
// Remove the timer task
|
// Remove the timer task
|
||||||
m_timers.erase(iter);
|
m_timers.erase(iter);
|
||||||
delete timer;
|
delete timer;
|
||||||
timer = NULL;
|
|
||||||
success = GHOST_kSuccess;
|
success = GHOST_kSuccess;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -118,12 +118,11 @@ int collada_export(Scene *sce,
|
|||||||
export_settings.export_set = BKE_object_relational_superset(sce, objectSet, (eObRelationTypes)includeFilter);
|
export_settings.export_set = BKE_object_relational_superset(sce, objectSet, (eObRelationTypes)includeFilter);
|
||||||
int export_count = BLI_linklist_count(export_settings.export_set);
|
int export_count = BLI_linklist_count(export_settings.export_set);
|
||||||
|
|
||||||
if (export_count==0)
|
if (export_count == 0) {
|
||||||
{
|
|
||||||
if (export_settings.selected) {
|
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");
|
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");
|
fprintf(stderr, "Collada: Your scene seems to be empty. No Objects will be exported.\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1342,7 +1342,7 @@ static int ui_id_brush_get_icon(const bContext *C, ID *id)
|
|||||||
Object *ob = CTX_data_active_object(C);
|
Object *ob = CTX_data_active_object(C);
|
||||||
SpaceImage *sima;
|
SpaceImage *sima;
|
||||||
EnumPropertyItem *items = NULL;
|
EnumPropertyItem *items = NULL;
|
||||||
int tool, mode = 0;
|
int tool = PAINT_TOOL_DRAW, mode = 0;
|
||||||
|
|
||||||
/* XXX: this is not nice, should probably make brushes
|
/* XXX: this is not nice, should probably make brushes
|
||||||
* be strictly in one paint mode only to avoid
|
* be strictly in one paint mode only to avoid
|
||||||
|
@ -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_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 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 *******************************/
|
/**************************** utilities *******************************/
|
||||||
|
|
||||||
|
@ -225,7 +225,7 @@ static void file_refresh(const bContext *C, ScrArea *sa)
|
|||||||
filelist_setsorting(sfile->files, params->sort);
|
filelist_setsorting(sfile->files, params->sort);
|
||||||
filelist_setfilter_options(sfile->files, (params->flag & FILE_HIDE_DOT) != 0,
|
filelist_setfilter_options(sfile->files, (params->flag & FILE_HIDE_DOT) != 0,
|
||||||
false, /* TODO hide_parent, should be controllable? */
|
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_id,
|
||||||
params->filter_glob,
|
params->filter_glob,
|
||||||
params->filter_search);
|
params->filter_search);
|
||||||
|
@ -1009,7 +1009,7 @@ static void draw_documentation(const SpaceText *st, ARegion *ar)
|
|||||||
if (lines >= DOC_HEIGHT) break;
|
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--;
|
// XXX doc_scroll--;
|
||||||
draw_documentation(st, ar);
|
draw_documentation(st, ar);
|
||||||
}
|
}
|
||||||
|
@ -141,18 +141,18 @@ static int time_view_all_exec(bContext *C, wmOperator *UNUSED(op))
|
|||||||
{
|
{
|
||||||
Scene *scene = CTX_data_scene(C);
|
Scene *scene = CTX_data_scene(C);
|
||||||
ARegion *ar = CTX_wm_region(C);
|
ARegion *ar = CTX_wm_region(C);
|
||||||
View2D *v2d = (ar) ? &ar->v2d : NULL;
|
|
||||||
float extra;
|
|
||||||
|
|
||||||
if (ELEM(NULL, scene, ar))
|
if (ELEM(NULL, scene, ar))
|
||||||
return OPERATOR_CANCELLED;
|
return OPERATOR_CANCELLED;
|
||||||
|
|
||||||
|
View2D *v2d = &ar->v2d;
|
||||||
|
|
||||||
/* set extents of view to start/end frames (Preview Range too) */
|
/* set extents of view to start/end frames (Preview Range too) */
|
||||||
v2d->cur.xmin = (float)PSFRA;
|
v2d->cur.xmin = (float)PSFRA;
|
||||||
v2d->cur.xmax = (float)PEFRA;
|
v2d->cur.xmax = (float)PEFRA;
|
||||||
|
|
||||||
/* we need an extra "buffer" factor on either side so that the endpoints are visible */
|
/* 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.xmin -= extra;
|
||||||
v2d->cur.xmax += extra;
|
v2d->cur.xmax += extra;
|
||||||
|
|
||||||
|
@ -259,8 +259,8 @@ bool GPU_legacy_support(void)
|
|||||||
|
|
||||||
if (G.debug & G_DEBUG_GPU) {
|
if (G.debug & G_DEBUG_GPU) {
|
||||||
printf("GL_CONTEXT_PROFILE_MASK = %#x (%s profile)\n", (unsigned int)profile,
|
printf("GL_CONTEXT_PROFILE_MASK = %#x (%s profile)\n", (unsigned int)profile,
|
||||||
profile & GL_CONTEXT_COMPATIBILITY_PROFILE_BIT ? "compatibility" :
|
(profile & GL_CONTEXT_COMPATIBILITY_PROFILE_BIT) ? "compatibility" :
|
||||||
profile & GL_CONTEXT_CORE_PROFILE_BIT ? "core" : "unknown");
|
(profile & GL_CONTEXT_CORE_PROFILE_BIT) ? "core" : "unknown");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (profile == 0) {
|
if (profile == 0) {
|
||||||
|
@ -333,7 +333,7 @@ static void rna_Actuator_constraint_detect_material_set(struct PointerRNA *ptr,
|
|||||||
bActuator *act = (bActuator *)ptr->data;
|
bActuator *act = (bActuator *)ptr->data;
|
||||||
bConstraintActuator *ca = act->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) {
|
if (old_value != value) {
|
||||||
ca->flag ^= ACT_CONST_MATERIAL;
|
ca->flag ^= ACT_CONST_MATERIAL;
|
||||||
|
@ -301,7 +301,7 @@ static void rna_Object_select_update(Main *UNUSED(bmain), Scene *scene, PointerR
|
|||||||
{
|
{
|
||||||
if (scene) {
|
if (scene) {
|
||||||
Object *ob = (Object *)ptr->id.data;
|
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);
|
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)
|
static void rna_Base_select_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
|
||||||
{
|
{
|
||||||
Base *base = (Base *)ptr->data;
|
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);
|
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;
|
Object *ob = (Object *)ptr->data;
|
||||||
int i;
|
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);
|
memset(values, 0, sizeof(int) * OB_MAX_STATES);
|
||||||
for (i = 0; i < OB_MAX_STATES; i++) {
|
for (i = 0; i < OB_MAX_STATES; i++) {
|
||||||
|
Loading…
Reference in New Issue
Block a user