diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-03 19:58:41 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-06 14:26:46 +0300 |
| commit | e0a4dc6a794670429dc12cd78ae9d19e50ac2a8e (patch) | |
| tree | 6a5f2f56b1442a691868df579048064bda63b4a7 /intern | |
| parent | 1450a375553d4549276f9098a7e43f740059489d (diff) | |
UI / Python: rename X-Ray to In Front, Draw to Display.
See T56648.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/blender_curves.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp index a1fd153b4fd..0bf90297263 100644 --- a/intern/cycles/blender/blender_curves.cpp +++ b/intern/cycles/blender/blender_curves.cpp @@ -134,9 +134,9 @@ static bool ObtainCacheParticleData(Mesh *mesh, if((b_part.render_type() == BL::ParticleSettings::render_type_PATH) && (b_part.type() == BL::ParticleSettings::type_HAIR)) { int shader = clamp(b_part.material()-1, 0, mesh->used_shaders.size()-1); - int draw_step = background ? b_part.render_step() : b_part.draw_step(); + int display_step = background ? b_part.render_step() : b_part.display_step(); int totparts = b_psys.particles.length(); - int totchild = background ? b_psys.child_particles.length() : (int)((float)b_psys.child_particles.length() * (float)b_part.draw_percentage() / 100.0f); + int totchild = background ? b_psys.child_particles.length() : (int)((float)b_psys.child_particles.length() * (float)b_part.display_percentage() / 100.0f); int totcurves = totchild; if(b_part.child_type() == 0 || totchild == 0) @@ -145,7 +145,7 @@ static bool ObtainCacheParticleData(Mesh *mesh, if(totcurves == 0) continue; - int ren_step = (1 << draw_step) + 1; + int ren_step = (1 << display_step) + 1; if(b_part.kink() == BL::ParticleSettings::kink_SPIRAL) ren_step += b_part.kink_extra_steps(); @@ -227,7 +227,7 @@ static bool ObtainCacheParticleUV(Mesh *mesh, if((b_part.render_type() == BL::ParticleSettings::render_type_PATH) && (b_part.type() == BL::ParticleSettings::type_HAIR)) { int totparts = b_psys.particles.length(); - int totchild = background ? b_psys.child_particles.length() : (int)((float)b_psys.child_particles.length() * (float)b_part.draw_percentage() / 100.0f); + int totchild = background ? b_psys.child_particles.length() : (int)((float)b_psys.child_particles.length() * (float)b_part.display_percentage() / 100.0f); int totcurves = totchild; if(b_part.child_type() == 0 || totchild == 0) @@ -286,7 +286,7 @@ static bool ObtainCacheParticleVcol(Mesh *mesh, if((b_part.render_type() == BL::ParticleSettings::render_type_PATH) && (b_part.type() == BL::ParticleSettings::type_HAIR)) { int totparts = b_psys.particles.length(); - int totchild = background ? b_psys.child_particles.length() : (int)((float)b_psys.child_particles.length() * (float)b_part.draw_percentage() / 100.0f); + int totchild = background ? b_psys.child_particles.length() : (int)((float)b_psys.child_particles.length() * (float)b_part.display_percentage() / 100.0f); int totcurves = totchild; if(b_part.child_type() == 0 || totchild == 0) |