[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55222] trunk/blender/source/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Tue Mar 12 22:46:34 CET 2013
Revision: 55222
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55222
Author: campbellbarton
Date: 2013-03-12 21:46:33 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenfont/intern/blf_translation.c
trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
trunk/blender/source/blender/editors/interface/interface_style.c
trunk/blender/source/blender/editors/space_info/textview.c
trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
trunk/blender/source/blender/editors/space_outliner/outliner_select.c
trunk/blender/source/blender/editors/transform/transform.c
Modified: trunk/blender/source/blender/blenfont/intern/blf_translation.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_translation.c 2013-03-12 19:43:14 UTC (rev 55221)
+++ trunk/blender/source/blender/blenfont/intern/blf_translation.c 2013-03-12 21:46:33 UTC (rev 55222)
@@ -93,14 +93,14 @@
unsigned char *BLF_get_unifont_mono(int *unifont_size_r)
{
#ifdef WITH_INTERNATIONAL
- if(unifont_mono_ttf == NULL) {
+ if (unifont_mono_ttf == NULL) {
const char *fontpath = BLI_get_folder(BLENDER_DATAFILES, "fonts");
if (fontpath) {
char unifont_path[1024];
BLI_snprintf(unifont_path, sizeof(unifont_path), "%s/%s", fontpath, unifont_mono_filename);
- unifont_mono_ttf = (unsigned char*)BLI_file_ungzip_to_mem(unifont_path, &unifont_mono_size);
+ unifont_mono_ttf = (unsigned char *)BLI_file_ungzip_to_mem(unifont_path, &unifont_mono_size);
}
else {
printf("%s: 'fonts' data path not found for international monospace font, continuing\n", __func__);
@@ -119,7 +119,7 @@
void BLF_free_unifont_mono(void)
{
#ifdef WITH_INTERNATIONAL
- if(unifont_mono_ttf)
+ if (unifont_mono_ttf)
MEM_freeN(unifont_mono_ttf);
#else
#endif
Modified: trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c 2013-03-12 19:43:14 UTC (rev 55221)
+++ trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c 2013-03-12 21:46:33 UTC (rev 55222)
@@ -668,9 +668,9 @@
const int *p = codec->supported_samplerates;
int best = 0;
int best_dist = INT_MAX;
- for (; *p; p++){
+ for (; *p; p++) {
int dist = abs(st->codec->sample_rate - *p);
- if (dist < best_dist){
+ if (dist < best_dist) {
best_dist = dist;
best = *p;
}
Modified: trunk/blender/source/blender/editors/interface/interface_style.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_style.c 2013-03-12 19:43:14 UTC (rev 55221)
+++ trunk/blender/source/blender/editors/interface/interface_style.c 2013-03-12 21:46:33 UTC (rev 55222)
@@ -331,7 +331,7 @@
uiFont *font = U.uifonts.first;
uiStyle *style = U.uistyles.first;
int monofont_size = datatoc_bmonofont_ttf_size;
- unsigned char *monofont_ttf = (unsigned char*)datatoc_bmonofont_ttf;
+ unsigned char *monofont_ttf = (unsigned char *)datatoc_bmonofont_ttf;
/* recover from uninitialized dpi */
if (U.dpi == 0)
@@ -410,7 +410,7 @@
if (!monofont_ttf) {
/* fall back if not found */
monofont_size = datatoc_bmonofont_ttf_size;
- monofont_ttf = (unsigned char*)datatoc_bmonofont_ttf;
+ monofont_ttf = (unsigned char *)datatoc_bmonofont_ttf;
}
}
Modified: trunk/blender/source/blender/editors/space_info/textview.c
===================================================================
--- trunk/blender/source/blender/editors/space_info/textview.c 2013-03-12 19:43:14 UTC (rev 55221)
+++ trunk/blender/source/blender/editors/space_info/textview.c 2013-03-12 21:46:33 UTC (rev 55222)
@@ -74,7 +74,7 @@
}
static void console_draw_sel(const char *str, const int sel[2], const int xy[2], const int str_len_draw,
- int cwidth, int lheight, const unsigned char bg_sel[4])
+ int cwidth, int lheight, const unsigned char bg_sel[4])
{
if (sel[0] <= str_len_draw && sel[1] >= 0) {
const int sta = txt_utf8_offset_to_column(str, max_ii(sel[0], 0));
@@ -99,7 +99,7 @@
*lines = 1;
*offsets = MEM_callocN(sizeof(**offsets) * (len * BLI_UTF8_WIDTH_MAX / MAX2(1, width - (BLI_UTF8_WIDTH_MAX - 1)) + 1),
- "console_wrap_offsets");
+ "console_wrap_offsets");
(*offsets)[0] = 0;
for (i = 0, end = width, j = 0; j < len && str[j]; j += BLI_str_utf8_size_safe(str + j)) {
@@ -145,7 +145,7 @@
/* last part */
ofs += txt_utf8_column_to_offset(str + ofs,
- (int)floor((float)cdc->mval[0] / cdc->cwidth));
+ (int)floor((float)cdc->mval[0] / cdc->cwidth));
CLAMP(ofs, 0, str_len);
*cdc->pos_pick += str_len - ofs;
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_draw.c 2013-03-12 19:43:14 UTC (rev 55221)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_draw.c 2013-03-12 21:46:33 UTC (rev 55222)
@@ -310,7 +310,7 @@
{
EditBone *ebone = (EditBone *)poin2;
if (ebone->flag & BONE_HIDDEN_A) {
- ebone->flag &= ~(BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL);
+ ebone->flag &= ~(BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL);
}
if (CTX_wm_window(C)->eventstate->ctrl) {
@@ -359,7 +359,7 @@
}
void restrictbutton_gr_restrict_flag(void *poin, void *poin2, int flag)
-{
+{
Scene *scene = (Scene *)poin;
GroupObject *gob;
Group *gr = (Group *)poin2;
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_select.c 2013-03-12 19:43:14 UTC (rev 55221)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_select.c 2013-03-12 21:46:33 UTC (rev 55222)
@@ -823,8 +823,8 @@
/* always makes active object */
if (tselem->type != TSE_SEQUENCE && tselem->type != TSE_SEQ_STRIP && tselem->type != TSE_SEQUENCE_DUP)
tree_element_set_active_object(C, scene, soops, te,
- 1 + (extend != 0 && tselem->type == 0),
- recursive && tselem->type == 0 );
+ 1 + (extend != 0 && tselem->type == 0),
+ recursive && tselem->type == 0 );
if (tselem->type == 0) { // the lib blocks
/* editmode? */
Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c 2013-03-12 19:43:14 UTC (rev 55221)
+++ trunk/blender/source/blender/editors/transform/transform.c 2013-03-12 21:46:33 UTC (rev 55222)
@@ -7452,4 +7452,4 @@
return ((t->around == V3D_LOCAL) && !ELEM3(t->mode, TFM_TRANSLATION, TFM_TIME_TRANSLATE, TFM_TIME_SLIDE));
}
-#undef MAX_INFO_LEN
\ No newline at end of file
+#undef MAX_INFO_LEN
More information about the Bf-blender-cvs
mailing list