sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Style cleanup

Browse Source
This commit is contained in:
Campbell Barton 2014-03-31 05:45:28 +11:00
parent 0b8774fc42
commit 482201d1a0
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/collada/ArmatureImporter.cpp
View File

@ -346,7 +346,7 @@ void ArmatureImporter::create_armature_bones( )
char * bone_name = (char *)bc_get_joint_name(*ri); char * bone_name = (char *)bc_get_joint_name(*ri);
Bone *bone = BKE_armature_find_bone_name(armature, bone_name); Bone *bone = BKE_armature_find_bone_name(armature, bone_name);
if(bone) { if (bone) {
fprintf(stderr, "Reuse of child bone [%s] as root bone in same Armature is not supported.\n", bone_name); fprintf(stderr, "Reuse of child bone [%s] as root bone in same Armature is not supported.\n", bone_name);
continue; continue;
} }

2
source/blender/editors/mask/mask_ops.c
View File

@ -80,7 +80,7 @@ MaskSplinePoint *ED_mask_point_find_nearest(const bContext *C, Mask *mask, const
MaskSplinePoint *point = NULL; MaskSplinePoint *point = NULL;
float co[2]; float co[2];
const float threshold_sq = threshold * threshold; const float threshold_sq = threshold * threshold;
float len_sq= FLT_MAX, scalex, scaley; float len_sq = FLT_MAX, scalex, scaley;
eMaskWhichHandle which_handle = MASK_WHICH_HANDLE_NONE; eMaskWhichHandle which_handle = MASK_WHICH_HANDLE_NONE;
int width, height; int width, height;

4
source/blender/editors/sculpt_paint/paint_utils.c
View File

@ -170,7 +170,7 @@ float paint_get_tex_pixel(MTex *mtex, float u, float v, struct ImagePool *pool,
float co[3] = {u, v, 0.0f}; float co[3] = {u, v, 0.0f};
externtex(mtex, co, &intensity, externtex(mtex, co, &intensity,
rgba, rgba + 1, rgba + 2, rgba + 3, thread, pool); rgba, rgba + 1, rgba + 2, rgba + 3, thread, pool);
return intensity; return intensity;
} }
@ -182,7 +182,7 @@ void paint_get_tex_pixel_col(MTex *mtex, float u, float v, float rgba[4], struct
float intensity; float intensity;
hasrgb = externtex(mtex, co, &intensity, hasrgb = externtex(mtex, co, &intensity,
rgba, rgba + 1, rgba + 2, rgba + 3, thread, pool); rgba, rgba + 1, rgba + 2, rgba + 3, thread, pool);
if (!hasrgb) { if (!hasrgb) {
rgba[0] = intensity; rgba[0] = intensity;
rgba[1] = intensity; rgba[1] = intensity;

2
source/blender/editors/sculpt_paint/sculpt.c
View File

@ -4534,7 +4534,7 @@ static void sculpt_stroke_update_step(bContext *C, struct PaintStroke *UNUSED(st
BKE_pbvh_bmesh_detail_size_set(ss->pbvh, BKE_pbvh_bmesh_detail_size_set(ss->pbvh,
(ss->cache->radius / (ss->cache->radius /
(float)ups->pixel_radius) * (float)ups->pixel_radius) *
(float)sd->detail_size / 0.4f); (float)sd->detail_size / 0.4f);
} }
if (sculpt_stroke_dynamic_topology(ss, brush)) { if (sculpt_stroke_dynamic_topology(ss, brush)) {

4
source/blender/makesrna/intern/rna_brush.c
View File

@ -473,7 +473,7 @@ static EnumPropertyItem *rna_Brush_direction_itemf(bContext *UNUSED(C), PointerR
} }
static EnumPropertyItem *rna_Brush_stroke_itemf(bContext *C, PointerRNA *UNUSED(ptr), static EnumPropertyItem *rna_Brush_stroke_itemf(bContext *C, PointerRNA *UNUSED(ptr),
PropertyRNA *UNUSED(prop), bool *UNUSED(r_free)) PropertyRNA *UNUSED(prop), bool *UNUSED(r_free))
{ {
static EnumPropertyItem sculpt_stroke_method_items[] = { static EnumPropertyItem sculpt_stroke_method_items[] = {
{0, "DOTS", 0, "Dots", "Apply paint on each mouse move step"}, {0, "DOTS", 0, "Dots", "Apply paint on each mouse move step"},
@ -486,7 +486,7 @@ static EnumPropertyItem *rna_Brush_stroke_itemf(bContext *C, PointerRNA *UNUSED(
PaintMode mode = BKE_paintmode_get_active_from_context(C); PaintMode mode = BKE_paintmode_get_active_from_context(C);
switch(mode) { switch (mode) {
case PAINT_SCULPT: case PAINT_SCULPT:
return sculpt_stroke_method_items; return sculpt_stroke_method_items;

2
source/blender/makesrna/intern/rna_smoke.c
View File

@ -231,7 +231,7 @@ static void rna_SmokeModifier_flame_grid_get(PointerRNA *ptr, float *values)
else else
flame = smoke_get_flame(sds->fluid); flame = smoke_get_flame(sds->fluid);
if(flame) if (flame)
memcpy(values, flame, size * sizeof(float)); memcpy(values, flame, size * sizeof(float));
else else
memset(values, 0, size * sizeof(float)); memset(values, 0, size * sizeof(float));

4
source/blender/render/intern/include/texture.h
View File

@ -35,7 +35,7 @@
#define BRICONT \ #define BRICONT \
texres->tin= (texres->tin-0.5f) * tex->contrast+tex->bright-0.5f; \ texres->tin= (texres->tin-0.5f) * tex->contrast+tex->bright-0.5f; \
if(!(tex->flag & TEX_NO_CLAMP)) { \ if (!(tex->flag & TEX_NO_CLAMP)) { \
if (texres->tin < 0.0f) texres->tin= 0.0f; \ if (texres->tin < 0.0f) texres->tin= 0.0f; \
else if (texres->tin > 1.0f) texres->tin= 1.0f; \ else if (texres->tin > 1.0f) texres->tin= 1.0f; \
} \ } \
@ -44,7 +44,7 @@
texres->tr= tex->rfac*((texres->tr-0.5f)*tex->contrast+tex->bright-0.5f); \ texres->tr= tex->rfac*((texres->tr-0.5f)*tex->contrast+tex->bright-0.5f); \
texres->tg= tex->gfac*((texres->tg-0.5f)*tex->contrast+tex->bright-0.5f); \ texres->tg= tex->gfac*((texres->tg-0.5f)*tex->contrast+tex->bright-0.5f); \
texres->tb= tex->bfac*((texres->tb-0.5f)*tex->contrast+tex->bright-0.5f); \ texres->tb= tex->bfac*((texres->tb-0.5f)*tex->contrast+tex->bright-0.5f); \
if(!(tex->flag & TEX_NO_CLAMP)) { \ if (!(tex->flag & TEX_NO_CLAMP)) { \
if (texres->tr < 0.0f) texres->tr= 0.0f; \ if (texres->tr < 0.0f) texres->tr= 0.0f; \
if (texres->tg < 0.0f) texres->tg= 0.0f; \ if (texres->tg < 0.0f) texres->tg= 0.0f; \
if (texres->tb < 0.0f) texres->tb= 0.0f; \ if (texres->tb < 0.0f) texres->tb= 0.0f; \

2
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
View File

@ -57,7 +57,7 @@ VBO::VBO(RAS_DisplayArray *data, unsigned int indices)
this->vertex_offset = (void*)(((RAS_TexVert*)0)->getXYZ()); this->vertex_offset = (void*)(((RAS_TexVert*)0)->getXYZ());
this->normal_offset = (void*)(((RAS_TexVert*)0)->getNormal()); this->normal_offset = (void*)(((RAS_TexVert*)0)->getNormal());
this->tangent_offset = (void*)(((RAS_TexVert*)0)->getTangent()); this->tangent_offset = (void*)(((RAS_TexVert*)0)->getTangent());
this->color_offset = (void*)(((RAS_TexVert*)0)->getRGBA());; this->color_offset = (void*)(((RAS_TexVert*)0)->getRGBA());
this->uv_offset = (void*)(((RAS_TexVert*)0)->getUV(0)); this->uv_offset = (void*)(((RAS_TexVert*)0)->getUV(0));
} }