diff options
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/BKE_report.h | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/anim_sys.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/idprop.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/packedFile.c | 2 | ||||
-rw-r--r-- | source/blender/editors/include/UI_interface.h | 18 | ||||
-rw-r--r-- | source/blender/editors/transform/transform.c | 2 |
8 files changed, 27 insertions, 11 deletions
diff --git a/source/blender/blenkernel/BKE_report.h b/source/blender/blenkernel/BKE_report.h index f6307806491..aa625fab3b2 100644 --- a/source/blender/blenkernel/BKE_report.h +++ b/source/blender/blenkernel/BKE_report.h @@ -54,7 +54,11 @@ __attribute__ ((format (printf, 3, 4))) ; void BKE_reports_prepend(ReportList *reports, const char *prepend); -void BKE_reports_prependf(ReportList *reports, const char *prepend, ...); +void BKE_reports_prependf(ReportList *reports, const char *prepend, ...) +#ifdef __GNUC__ +__attribute__ ((format (printf, 2, 3))) +#endif +; ReportType BKE_report_print_level(ReportList *reports); void BKE_report_print_level_set(ReportList *reports, ReportType level); diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index fc58799eb18..75b9ae59e26 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -2171,7 +2171,7 @@ static void animsys_evaluate_overrides (PointerRNA *ptr, AnimData *adt) * * Current Status: * - Currently (as of September 2009), overrides we haven't needed to (fully) implement overrides. - * However, the code fo this is relatively harmless, so is left in the code for now. + * However, the code for this is relatively harmless, so is left in the code for now. */ /* Evaluation loop for evaluation animation data diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 474aa84fec6..4de7df098c3 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -230,7 +230,7 @@ static int can_pbvh_draw(Object *ob, DerivedMesh *dm) int deformed= 0; /* active modifiers means extra deformation, which can't be handled correct - * on bith of PBVH and sculpt "layer" levels, so use PBVH only for internal brush + * on birth of PBVH and sculpt "layer" levels, so use PBVH only for internal brush * stuff and show final DerivedMesh so user would see actual object shape */ deformed|= ob->sculpt->modifiers_active; diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index 1fee5cfa359..bb51325a6ef 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -484,7 +484,7 @@ void IDP_ReplaceGroupInGroup(IDProperty *dest, IDProperty *src) } /* * replaces a property with the same name in a group, or adds - * it if the propery doesn't exist. + * it if the properly doesn't exist. */ void IDP_ReplaceInGroup(IDProperty *group, IDProperty *prop) { diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 7280af18493..514380dc980 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -327,7 +327,7 @@ static void mesh_ensure_tessellation_customdata(Mesh *me) /* TODO - add some --debug-mesh option */ if (G.debug & G_DEBUG) { - /* note: this warning may be un-called for if we are inirializing the mesh for the + /* note: this warning may be un-called for if we are initializing the mesh for the * first time from bmesh, rather then giving a warning about this we could be smarter * and check if there was any data to begin with, for now just print the warning with * some info to help troubleshoot whats going on - campbell */ @@ -1104,7 +1104,7 @@ void mesh_strip_loose_polysloops(Mesh *me) b++; } else { - /* XXX Theorically, we should be able to not do this, as no remaining poly + /* XXX Theoretically, we should be able to not do this, as no remaining poly * should use any stripped loop. But for security's sake... */ new_idx[a] = -a; } diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index 8a940e339bc..b55033b8493 100644 --- a/source/blender/blenkernel/intern/packedFile.c +++ b/source/blender/blenkernel/intern/packedFile.c @@ -392,7 +392,7 @@ int checkPackedFile(const char *filename, PackedFile *pf) /* unpackFile() looks at the existing files (abs_name, local_name) and a packed file. * * It returns a char *to the existing file name / new file name or NULL when - * there was an error or when the user desides to cancel the operation. + * there was an error or when the user decides to cancel the operation. */ char *unpackFile(ReportList *reports, const char *abs_name, const char *local_name, PackedFile *pf, int how) diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index cdb2472706c..d262c650e1c 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -322,10 +322,22 @@ uiPopupMenu *uiPupMenuBegin(struct bContext *C, const char *title, int icon); void uiPupMenuEnd(struct bContext *C, struct uiPopupMenu *head); struct uiLayout *uiPupMenuLayout(uiPopupMenu *head); -void uiPupMenuOkee(struct bContext *C, const char *opname, const char *str, ...); +void uiPupMenuOkee(struct bContext *C, const char *opname, const char *str, ...) +#ifdef __GNUC__ +__attribute__ ((format (printf, 3, 4))) +#endif +; void uiPupMenuSaveOver(struct bContext *C, struct wmOperator *op, const char *filename); -void uiPupMenuNotice(struct bContext *C, const char *str, ...); -void uiPupMenuError(struct bContext *C, const char *str, ...); +void uiPupMenuNotice(struct bContext *C, const char *str, ...) +#ifdef __GNUC__ +__attribute__ ((format (printf, 2, 3))) +#endif +; +void uiPupMenuError(struct bContext *C, const char *str, ...) +#ifdef __GNUC__ +__attribute__ ((format (printf, 2, 3))) +#endif +; void uiPupMenuReports(struct bContext *C, struct ReportList *reports); void uiPupMenuInvoke(struct bContext *C, const char *idname); /* popup registered menu */ diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 6b46a7bce8e..f3819a1b83c 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -4788,7 +4788,7 @@ void projectSVData(TransInfo *t, int final) } if (e_sel) { - /* warning if the UV's are not contiguiys, this will copy from the _wrong_ UVs + /* warning if the UV's are not contiguous, this will copy from the _wrong_ UVs * in fact whenever the face being copied is not 'f_copy' this can happen, * we could be a lot smarter about this but would need to deal with every UV channel or * add a way to mask out lauers when calling #BM_loop_interp_from_face() */ |