Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-01-07 07:24:22 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-01-07 07:24:22 +0400
commit6747dec926ded010641cef37bd4384fff15dc961 (patch)
treecb8fc2771e289495486cb9cb55c11f612fa5ec0b /source/blender/editors
parent85b59bd89e3f220f8921d7a227f17534bb428145 (diff)
style cleanup
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/physics/physics_fluid.c2
-rw-r--r--source/blender/editors/render/render_preview.c2
-rw-r--r--source/blender/editors/space_view3d/view3d_draw.c12
3 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c
index c54ac485be6..fc55b2b5915 100644
--- a/source/blender/editors/physics/physics_fluid.c
+++ b/source/blender/editors/physics/physics_fluid.c
@@ -237,7 +237,7 @@ static void init_time(FluidsimSettings *domainSettings, FluidAnimChannels *chann
{
int i;
- channels->timeAtFrame = MEM_callocN((channels->length+1)*sizeof(float), "timeAtFrame channel");
+ channels->timeAtFrame = MEM_callocN((channels->length + 1) * sizeof(float), "timeAtFrame channel");
channels->timeAtFrame[0] = channels->timeAtFrame[1] = domainSettings->animStart; // start at index 1
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index 2b714daecf8..25ad1f61aaf 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -712,7 +712,7 @@ static void shader_preview_render(ShaderPreview *sp, ID *id, int split, int firs
else {
/* validate owner */
//if (ri->rect == NULL)
- // ri->rect= MEM_mallocN(sizeof(int)*ri->pr_rectx*ri->pr_recty, "BIF_previewrender");
+ // ri->rect= MEM_mallocN(sizeof(int) * ri->pr_rectx*ri->pr_recty, "BIF_previewrender");
//RE_ResultGet32(re, ri->rect);
}
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index d66236d1c51..202b5befa01 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -937,7 +937,7 @@ static void draw_selected_name(Scene *scene, Object *ob, rcti *rect)
}
/* color depends on whether there is a keyframe */
- if (id_frame_has_keyframe((ID *)ob, /*BKE_scene_frame_get(scene)*/ (float)(CFRA), ANIMFILTER_KEYS_LOCAL))
+ if (id_frame_has_keyframe((ID *)ob, /* BKE_scene_frame_get(scene) */ (float)(CFRA), ANIMFILTER_KEYS_LOCAL))
UI_ThemeColor(TH_VERTEX_SELECT);
else
UI_ThemeColor(TH_TEXT_HI);
@@ -3036,10 +3036,10 @@ static void view3d_main_area_draw_objects(const bContext *C, ARegion *ar, const
for (x = 0; x < XTOT - 1; x++) {
for (y = 0; y < YTOT - 1; y++) {
- indices[x][y][0] = x*XTOT + y;
- indices[x][y][1] = x*XTOT + y + 1;
- indices[x][y][2] = (x + 1)*XTOT + y + 1;
- indices[x][y][3] = (x + 1)*XTOT + y;
+ indices[x][y][0] = x * XTOT + y;
+ indices[x][y][1] = x * XTOT + y + 1;
+ indices[x][y][2] = (x + 1) * XTOT + y + 1;
+ indices[x][y][3] = (x + 1) * XTOT + y;
}
}
@@ -3089,7 +3089,7 @@ static void view3d_main_area_draw_objects(const bContext *C, ARegion *ar, const
glVertexPointer(2, GL_FLOAT, 0, grid_pos);
glColorPointer(4, GL_UNSIGNED_BYTE, 0, grid_col);
- glDrawElements(GL_QUADS, (XTOT - 1)*(YTOT - 1)*4, GL_UNSIGNED_SHORT, indices);
+ glDrawElements(GL_QUADS, (XTOT - 1) * (YTOT - 1) * 4, GL_UNSIGNED_SHORT, indices);
glDisableClientState(GL_VERTEX_ARRAY);
glDisableClientState(GL_COLOR_ARRAY);