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

style cleanup

Browse Source
This commit is contained in:
Campbell Barton 2013-10-10 17:28:01 +00:00
parent 3d4bbd278a
commit 8fd52b3433
5 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
intern/cycles/kernel/shaders/node_hair_bsdf.osl
View File

@ -33,8 +33,9 @@ shader node_hair_bsdf(
getattribute("geom:is_curve", IsStrand);
if (!IsStrand) {
if (backfacing())
if (backfacing()) {
BSDF = transparent();
}
else {
if (component == "Reflection")
BSDF = Color * hair_reflection(Normal, roughnessh, roughnessv, normalize(dPdv), 0.0);
@ -43,8 +44,9 @@ shader node_hair_bsdf(
}
}
else {
if (backfacing())
if (backfacing()) {
BSDF = transparent();
}
else {
if (component == "Reflection")
BSDF = Color * hair_reflection(Normal, roughnessh, roughnessv, dPdu, -Offset);
@ -53,4 +55,3 @@ shader node_hair_bsdf(
}
}
}

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

@ -89,7 +89,7 @@ static TexSnapshot secondary_snap = {0};
static CursorSnapshot cursor_snap = {0};
/* delete overlay cursor textures to preserve memory and invalidate all overlay flags */
void paint_cursor_delete_textures()
void paint_cursor_delete_textures(void)
{
glDeleteTextures(1, &primary_snap.overlay_texture);
glDeleteTextures(1, &secondary_snap.overlay_texture);

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

@ -4685,7 +4685,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
RNA_def_property_range(prop, 0.0, 1000.0);
RNA_def_property_ui_text(prop, "Scale",
"Instead of automatically normalizing to 0..1, "
"apply a user scale to the derivative map.");
"apply a user scale to the derivative map");
/* stamp */