diff options
Diffstat (limited to 'intern/cycles/render')
-rw-r--r-- | intern/cycles/render/camera.cpp | 13 | ||||
-rw-r--r-- | intern/cycles/render/nodes.cpp | 4 |
2 files changed, 12 insertions, 5 deletions
diff --git a/intern/cycles/render/camera.cpp b/intern/cycles/render/camera.cpp index 9c9070c8a90..a950324d4d4 100644 --- a/intern/cycles/render/camera.cpp +++ b/intern/cycles/render/camera.cpp @@ -716,10 +716,17 @@ float Camera::world_to_raster_size(float3 P) float3 raster = transform_perspective(&full_cameratoraster, make_float3(dir.x, dir.y, 0.0f)); ray.t = 1.0f; - camera_sample_panorama(&kernel_camera, kernel_camera_motion.data(), raster.x, raster.y, 0.0f, 0.0f, &ray); - if(ray.t == 0.0f) { + camera_sample_panorama( + &kernel_camera, kernel_camera_motion.data(), raster.x, raster.y, 0.0f, 0.0f, &ray); + if (ray.t == 0.0f) { /* No differentials, just use from directly ahead. */ - camera_sample_panorama(&kernel_camera, kernel_camera_motion.data(), 0.5f*full_width, 0.5f*full_height, 0.0f, 0.0f, &ray); + camera_sample_panorama(&kernel_camera, + kernel_camera_motion.data(), + 0.5f * full_width, + 0.5f * full_height, + 0.0f, + 0.0f, + &ray); } #else camera_sample_panorama(&kernel_camera, diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index f3572ee1585..30968ab0c5e 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -3888,7 +3888,7 @@ void ParticleInfoNode::attributes(Shader *shader, AttributeRequestSet *attribute if (!output("Location")->links.empty()) attributes->add(ATTR_STD_PARTICLE); #if 0 /* not yet supported */ - if(!output("Rotation")->links.empty()) + if (!output("Rotation")->links.empty()) attributes->add(ATTR_STD_PARTICLE); #endif if (!output("Size")->links.empty()) @@ -3933,7 +3933,7 @@ void ParticleInfoNode::compile(SVMCompiler &compiler) /* quaternion data is not yet supported by Cycles */ #if 0 out = output("Rotation"); - if(!out->links.empty()) { + if (!out->links.empty()) { compiler.add_node(NODE_PARTICLE_INFO, NODE_INFO_PAR_ROTATION, compiler.stack_assign(out)); } #endif |