diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-06-27 20:16:54 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-06-27 20:16:54 +0400 |
| commit | 4a113cab0aa4cae3b2a0a59cc5057852c5b5437d (patch) | |
| tree | 3d32154e9e8df2b9251a7d2f71594cf931a89c4b /intern/cycles/blender | |
| parent | 63f1e253c360dcb550bc4b492ccdf0bebf3afa22 (diff) | |
| parent | c15b13f78f359728a2b458126a907ff1a1b80365 (diff) | |
Merged revision(s) 57768-57827 from trunk/blender into soc-2013-dingto
Diffstat (limited to 'intern/cycles/blender')
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 7 | ||||
| -rw-r--r-- | intern/cycles/blender/blender_curves.cpp | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 5dd5cbf0ad4..b52a2c53f87 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -769,6 +769,7 @@ class CyclesWorld_PT_ambient_occlusion(CyclesButtonsPanel, Panel): row.prop(light, "ao_factor", text="Factor") row.prop(light, "distance", text="Distance") + class CyclesWorld_PT_mist(CyclesButtonsPanel, Panel): bl_label = "Mist Pass" bl_context = "world" @@ -935,7 +936,7 @@ class CyclesMaterial_PT_settings(CyclesButtonsPanel, Panel): col = split.column(align=True) col.label() col.prop(mat, "pass_index") - + col = layout.column() col.prop(cmat, "sample_as_light") col.prop(cmat, "use_transparent_shadow") @@ -1161,7 +1162,7 @@ class CyclesRender_PT_CurveRendering(CyclesButtonsPanel, Panel): row = layout.row() row.prop(ccscene, "use_parents", text="Include parents") - + row = layout.row() row.prop(ccscene, "minimum_width", text="Min Pixels") row.prop(ccscene, "maximum_width", text="Max Ext.") @@ -1193,7 +1194,7 @@ class CyclesParticle_PT_CurveSettings(CyclesButtonsPanel, Panel): row = layout.row() row.prop(cpsys, "root_width", text="Root") row.prop(cpsys, "tip_width", text="Tip") - + row = layout.row() row.prop(cpsys, "radius_scale", text="Scaling") row.prop(cpsys, "use_closetip", text="Close tip") diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp index 56d78fb5c26..27c52797f5f 100644 --- a/intern/cycles/blender/blender_curves.cpp +++ b/intern/cycles/blender/blender_curves.cpp @@ -183,7 +183,7 @@ bool ObtainCacheParticleData(Mesh *mesh, BL::Mesh *b_mesh, BL::Object *b_ob, Par int mi = clamp(b_psys.settings().material()-1, 0, mesh->used_shaders.size()-1); int shader = mesh->used_shaders[mi]; int draw_step = background ? b_psys.settings().render_step() : b_psys.settings().draw_step(); - int ren_step = (int)pow((float)2.0f,(float)draw_step); + int ren_step = (int)powf(2.0f, (float)draw_step); int totparts = b_psys.particles.length(); int totchild = background ? b_psys.child_particles.length() : (int)((float)b_psys.child_particles.length() * (float)b_psys.settings().draw_percentage() / 100.0f); int totcurves = totchild; |