Commit: 1daa20ad9f6f0c433a4e0a97a74e5beb9ea4e2c7 Author: Campbell Barton Date: Fri Jul 6 10:17:58 2018 +0200 Branches: master https://developer.blender.org/rB1daa20ad9f6f0c433a4e0a97a74e5beb9ea4e2c7
Cleanup: strip trailing space for cycles =================================================================== M intern/cycles/app/cycles_cubin_cc.cpp M intern/cycles/app/cycles_server.cpp M intern/cycles/app/cycles_standalone.cpp M intern/cycles/app/cycles_xml.cpp M intern/cycles/app/io_export_cycles_xml.py M intern/cycles/blender/blender_camera.cpp M intern/cycles/blender/blender_object.cpp M intern/cycles/blender/blender_object_cull.cpp M intern/cycles/blender/blender_particles.cpp M intern/cycles/blender/blender_python.cpp M intern/cycles/blender/blender_shader.cpp M intern/cycles/blender/blender_sync.cpp M intern/cycles/blender/blender_sync.h M intern/cycles/bvh/bvh_binning.cpp M intern/cycles/bvh/bvh_node.cpp M intern/cycles/bvh/bvh_sort.cpp M intern/cycles/device/device.h M intern/cycles/device/device_intern.h M intern/cycles/device/device_memory.cpp M intern/cycles/device/device_memory.h M intern/cycles/device/device_multi.cpp M intern/cycles/device/device_network.cpp M intern/cycles/device/device_network.h M intern/cycles/device/device_split_kernel.cpp M intern/cycles/device/device_split_kernel.h M intern/cycles/device/device_task.cpp M intern/cycles/device/device_task.h M intern/cycles/device/opencl/memory_manager.cpp M intern/cycles/device/opencl/memory_manager.h M intern/cycles/doc/license/Apache_2.0.txt M intern/cycles/doc/license/ILM.txt M intern/cycles/doc/license/NVidia.txt M intern/cycles/doc/license/OSL.txt M intern/cycles/doc/license/Sobol.txt M intern/cycles/doc/license/readme.txt M intern/cycles/graph/node.cpp M intern/cycles/graph/node.h M intern/cycles/graph/node_enum.h M intern/cycles/graph/node_type.cpp M intern/cycles/graph/node_type.h M intern/cycles/graph/node_xml.cpp M intern/cycles/graph/node_xml.h M intern/cycles/kernel/closure/bsdf.h M intern/cycles/kernel/closure/bsdf_ashikhmin_shirley.h M intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h M intern/cycles/kernel/closure/bsdf_diffuse.h M intern/cycles/kernel/closure/bsdf_diffuse_ramp.h M intern/cycles/kernel/closure/bsdf_hair.h M intern/cycles/kernel/closure/bsdf_microfacet.h M intern/cycles/kernel/closure/bsdf_phong_ramp.h M intern/cycles/kernel/closure/bsdf_principled_diffuse.h M intern/cycles/kernel/closure/bsdf_principled_sheen.h M intern/cycles/kernel/closure/bsdf_reflection.h M intern/cycles/kernel/closure/bsdf_refraction.h M intern/cycles/kernel/closure/bsdf_toon.h M intern/cycles/kernel/closure/bsdf_transparent.h M intern/cycles/kernel/closure/bsdf_util.h M intern/cycles/kernel/closure/bssrdf.h M intern/cycles/kernel/closure/emissive.h M intern/cycles/kernel/closure/volume.h M intern/cycles/kernel/geom/geom.h M intern/cycles/kernel/geom/geom_attribute.h M intern/cycles/kernel/geom/geom_motion_curve.h M intern/cycles/kernel/geom/geom_motion_triangle.h M intern/cycles/kernel/geom/geom_motion_triangle_shader.h M intern/cycles/kernel/geom/geom_object.h M intern/cycles/kernel/geom/geom_patch.h M intern/cycles/kernel/geom/geom_primitive.h M intern/cycles/kernel/geom/geom_subd_triangle.h M intern/cycles/kernel/geom/geom_volume.h M intern/cycles/kernel/kernel.h M intern/cycles/kernel/kernel_accumulate.h M intern/cycles/kernel/kernel_bake.h M intern/cycles/kernel/kernel_compat_cpu.h M intern/cycles/kernel/kernel_compat_opencl.h M intern/cycles/kernel/kernel_differential.h M intern/cycles/kernel/kernel_emission.h M intern/cycles/kernel/kernel_film.h M intern/cycles/kernel/kernel_jitter.h M intern/cycles/kernel/kernel_light.h M intern/cycles/kernel/kernel_montecarlo.h M intern/cycles/kernel/kernel_passes.h M intern/cycles/kernel/kernel_path.h M intern/cycles/kernel/kernel_path_state.h M intern/cycles/kernel/kernel_path_subsurface.h M intern/cycles/kernel/kernel_path_surface.h M intern/cycles/kernel/kernel_path_volume.h M intern/cycles/kernel/kernel_projection.h M intern/cycles/kernel/kernel_random.h M intern/cycles/kernel/kernel_subsurface.h M intern/cycles/kernel/kernel_textures.h M intern/cycles/kernel/kernel_types.h M intern/cycles/kernel/kernel_volume.h M intern/cycles/kernel/kernels/cpu/kernel_split.cpp M intern/cycles/kernel/kernels/cuda/kernel_config.h M intern/cycles/kernel/kernels/cuda/kernel_cuda_image.h M intern/cycles/kernel/kernels/opencl/kernel_split_function.h M intern/cycles/kernel/osl/background.cpp M intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp M intern/cycles/kernel/osl/bsdf_phong_ramp.cpp M intern/cycles/kernel/osl/emissive.cpp M intern/cycles/kernel/osl/osl_bssrdf.cpp M intern/cycles/kernel/osl/osl_closures.cpp M intern/cycles/kernel/osl/osl_closures.h M intern/cycles/kernel/osl/osl_globals.h M intern/cycles/kernel/osl/osl_services.cpp M intern/cycles/kernel/osl/osl_services.h M intern/cycles/kernel/osl/osl_shader.cpp M intern/cycles/kernel/osl/osl_shader.h M intern/cycles/kernel/shaders/node_color.h M intern/cycles/kernel/shaders/node_fresnel.h M intern/cycles/kernel/shaders/node_ramp_util.h M intern/cycles/kernel/shaders/node_texture.h M intern/cycles/kernel/shaders/stdosl.h M intern/cycles/kernel/split/kernel_branched.h M intern/cycles/kernel/split/kernel_lamp_emission.h M intern/cycles/kernel/split/kernel_shadow_blocked_ao.h M intern/cycles/kernel/svm/svm.h M intern/cycles/kernel/svm/svm_attribute.h M intern/cycles/kernel/svm/svm_bevel.h M intern/cycles/kernel/svm/svm_brick.h M intern/cycles/kernel/svm/svm_bump.h M intern/cycles/kernel/svm/svm_camera.h M intern/cycles/kernel/svm/svm_checker.h M intern/cycles/kernel/svm/svm_closure.h M intern/cycles/kernel/svm/svm_color_util.h M intern/cycles/kernel/svm/svm_convert.h M intern/cycles/kernel/svm/svm_displace.h M intern/cycles/kernel/svm/svm_fresnel.h M intern/cycles/kernel/svm/svm_geometry.h M intern/cycles/kernel/svm/svm_gradient.h M intern/cycles/kernel/svm/svm_hsv.h M intern/cycles/kernel/svm/svm_image.h M intern/cycles/kernel/svm/svm_invert.h M intern/cycles/kernel/svm/svm_light_path.h M intern/cycles/kernel/svm/svm_magic.h M intern/cycles/kernel/svm/svm_mapping.h M intern/cycles/kernel/svm/svm_math.h M intern/cycles/kernel/svm/svm_math_util.h M intern/cycles/kernel/svm/svm_mix.h M intern/cycles/kernel/svm/svm_musgrave.h M intern/cycles/kernel/svm/svm_noise.h M intern/cycles/kernel/svm/svm_noisetex.h M intern/cycles/kernel/svm/svm_normal.h M intern/cycles/kernel/svm/svm_ramp.h M intern/cycles/kernel/svm/svm_ramp_util.h M intern/cycles/kernel/svm/svm_sepcomb_hsv.h M intern/cycles/kernel/svm/svm_sepcomb_vector.h M intern/cycles/kernel/svm/svm_sky.h M intern/cycles/kernel/svm/svm_tex_coord.h M intern/cycles/kernel/svm/svm_texture.h M intern/cycles/kernel/svm/svm_types.h M intern/cycles/kernel/svm/svm_value.h M intern/cycles/kernel/svm/svm_vector_transform.h M intern/cycles/kernel/svm/svm_voronoi.h M intern/cycles/kernel/svm/svm_wave.h M intern/cycles/kernel/svm/svm_wavelength.h M intern/cycles/kernel/svm/svm_wireframe.h M intern/cycles/render/attribute.cpp M intern/cycles/render/attribute.h M intern/cycles/render/background.cpp M intern/cycles/render/background.h M intern/cycles/render/bake.h M intern/cycles/render/buffers.cpp M intern/cycles/render/buffers.h M intern/cycles/render/camera.cpp M intern/cycles/render/camera.h M intern/cycles/render/constant_fold.h M intern/cycles/render/curves.cpp M intern/cycles/render/curves.h M intern/cycles/render/film.cpp M intern/cycles/render/film.h M intern/cycles/render/graph.cpp M intern/cycles/render/graph.h M intern/cycles/render/image.cpp M intern/cycles/render/image.h M intern/cycles/render/integrator.cpp M intern/cycles/render/integrator.h M intern/cycles/render/light.cpp M intern/cycles/render/light.h M intern/cycles/render/mesh.h M intern/cycles/render/mesh_displace.cpp M intern/cycles/render/mesh_subdivision.cpp M intern/cycles/render/nodes.cpp M intern/cycles/render/nodes.h M intern/cycles/render/object.cpp M intern/cycles/render/object.h M intern/cycles/render/osl.cpp M intern/cycles/render/osl.h M intern/cycles/render/particles.cpp M intern/cycles/render/particles.h M intern/cycles/render/scene.cpp M intern/cycles/render/scene.h M intern/cycles/render/session.cpp M intern/cycles/render/session.h M intern/cycles/render/shader.cpp M intern/cycles/render/shader.h M intern/cycles/render/sobol.cpp M intern/cycles/render/sobol.h M intern/cycles/render/svm.cpp M intern/cycles/render/svm.h M intern/cycles/render/tables.cpp M intern/cycles/render/tables.h M intern/cycles/render/tile.cpp M intern/cycles/render/tile.h M intern/cycles/subd/subd_dice.cpp M intern/cycles/subd/subd_dice.h M intern/cycles/subd/subd_patch.cpp M intern/cycles/subd/subd_patch.h M intern/cycles/subd/subd_patch_table.cpp M intern/cycles/subd/subd_patch_table.h M intern/cycles/subd/subd_split.cpp M intern/cycles/subd/subd_split.h M intern/cycles/util/util_algorithm.h M intern/cycles/util/util_args.h M intern/cycles/util/util_boundbox.h M intern/cycles/util/util_color.h M intern/cycles/util/util_defines.h M intern/cycles/util/util_foreach.h M intern/cycles/util/util_function.h M intern/cycles/util/util_half.h M intern/cycles/util/util_hash.h M intern/cycles/util/util_list.h M intern/cycles/util/util_map.h M intern/cycles/util/util_md5.cpp M intern/cycles/util/util_md5.h M intern/cycles/util/util_optimization.h M intern/cycles/util/util_param.h M intern/cycles/util/util_path.cpp M intern/cycles/util/util_path.h M intern/cycles/util/util_progress.h M intern/cycles/util/util_projection.h M intern/cycles/util/util_queue.h M intern/cycles/util/util_rect.h M intern/cycles/util/util_set.h M intern/cycles/util/util_simd.h M intern/cycles/util/util_sky_model.cpp M intern/cycles/util/util_sseb.h M intern/cycles/util/util_ssef.h M intern/cycles/util/util_ssei.h M intern/cycles/util/util_string.cpp M intern/cycles/util/util_string.h M intern/cycles/util/util_system.cpp M intern/cycles/util/util_system.h M intern/cycles/util/util_task.cpp M intern/cycles/util/util_task.h M intern/cycles/util/util_thread.h M intern/cycles/util/util_time.cpp M intern/cycles/util/util_time.h M intern/cycles/util/util_transform.cpp M intern/cycles/util/util_transform.h M intern/cycles/util/util_types.h M intern/cycles/util/util_types_float4_impl.h M intern/cycles/util/util_vector.h M intern/cycles/util/util_view.cpp M intern/cycles/util/util_view.h M intern/cycles/util/util_windows.h =================================================================== diff --git a/intern/cycles/app/cycles_cubin_cc.cpp b/intern/cycles/app/cycles_cubin_cc.cpp index 3c83bf2dae3..01a1234531b 100644 --- a/intern/cycles/app/cycles_cubin_cc.cpp +++ b/intern/cycles/app/cycles_cubin_cc.cpp @@ -164,7 +164,7 @@ bool link_ptxas(CompilationSettings &settings) ptx += " --verbose"; printf("%s\n", ptx.c_str()); } - + int pxresult = system(ptx.c_str()); if(pxresult) { fprintf(stderr, "Error: ptxas failed (%x)\n\n", pxresult); diff --git a/intern/cycles/app/cycles_server.cpp b/intern/cycles/app/cycles_server.cpp index e65b9d769e4..e2166473aa3 100644 --- a/intern/cycles/app/cycles_server.cpp +++ b/intern/cycles/app/cycles_server.cpp @@ -112,4 +112,3 @@ int main(int argc, const char **argv) return 0; } - diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp index c682744f5fa..1ec8d18f410 100644 --- a/intern/cycles/app/cycles_standalone.cpp +++ b/intern/cycles/app/cycles_standalone.cpp @@ -524,4 +524,3 @@ int main(int argc, const char **argv) return 0; } - diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp index a46955322e3..895a83818df 100644 --- a/intern/cycles/app/cycles_xml.cpp +++ b/intern/cycles/app/cycles_xml.cpp @@ -184,7 +184,7 @@ static bool xml_equal_string(xml_node node, const char *name, const char *value) if(attr) return string_iequals(attr.value(), value); - + return false; } @@ -697,4 +697,3 @@ void xml_read_file(Scene *scene, const char *filepath) } CCL_NAMESPACE_END - diff --git a/intern/cycles/app/io_export_cycles_xml.py b/intern/cycles/app/io_export_cycles_xml.py index 7d6d85f88af..816536c0071 100644 --- a/intern/cycles/app/io_export_cycles_xml.py +++ b/intern/cycles/app/io_export_cycles_xml.py @@ -39,7 +39,7 @@ def write(node, fname): f = open(fname, "w") f.write(s) - + class CyclesXMLSettings(bpy.types.PropertyGroup): @classmethod def register(cls): @@ -53,11 +53,11 @@ class CyclesXMLSettings(bpy.types.PropertyGroup): maxlen=256, default='', subtype='FILE_PATH') - + @classmethod def unregister(cls): del bpy.types.Scene.cycles_xml - + # User Interface Drawing Code class RenderButtonsPanel(): bl_space_type = 'PROPERTIES' @@ -75,13 +75,13 @@ class PHYSICS_PT_fluid_export(RenderButtonsPanel, bpy.types.Panel): def draw(self, context): layout = self.layout - + cycles = context.scene.cycles_xml - + #layout.prop(cycles, "filepath") layout.operator("export_mesh.cycles_xml") - + # Export Operator class ExportCyclesXML(bpy.types.Operator, ExportHelper): bl_idname = "export_mesh.cycles_xml" @@ -118,23 +118,23 @@ class ExportCyclesXML(bpy.types.Operator, ExportHelper): P += "%f %f %f " % (v.co[0], v.co[1], v.co[2]) verts_and_uvs = zip(mesh.tessfaces, mesh.tessface_uv_textures.active.data) - + for f, uvf in verts_and_uvs: vcount = len(f.vertices) nverts += str(vcount) + " " for v in f.vertices: verts += str(v) + " " - + uvs += str(uvf.uv1[0]) + " " + str(uvf.uv1[1]) + " " uvs += str(uvf.uv2[0]) + " " + str(uvf.uv2[1]) + " " uvs += str(uvf.uv3[0]) + " " + str(uvf.uv3[1]) + " " if vcount==4: uvs += " " + str(uvf.uv4[0]) + " " + str(uvf.uv4[1]) + " " - + node = etree.Element('mesh', attrib={'nverts': nverts.strip(), 'verts': verts.strip(), 'P': P, 'UV' : uvs.strip()}) - + # write to file write(node, filepath) @@ -148,5 +148,3 @@ def unregister(): if __name__ == "__main__": register() - - diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp index 1b798bcb42c..5a447a347a3 100644 --- a/intern/cycles/blender/blender_camera.cpp +++ b/intern/cycles/blender/blender_camera.cpp @@ -124,7 +124,7 @@ static float blender_camera_focal_distance(BL::RenderEngine& b_engine, if(!b_dof_object) return b_camera.dof_distance(); - + /* for dof object, return distance along camera Z direction */ BL::Array<float, 16> b_ob_matrix; b_engine.camera_model_matrix(b_ob, bcam->use_spherical_stereo, b_ob_matrix); @@ -726,7 +726,7 @@ static void blender_camera_view_subset(BL::RenderEngine& b_engine, blender_camera_viewplane(&cam_bcam, cam_bcam.full_width, cam_bcam.full_height, &cam, &cam_aspect, &sensor_size); - + /* return */ *view_box = view * (1.0f/view_aspect); *cam_box = cam * (1.0f/cam_aspect); @@ -895,4 +895,3 @@ BufferParams BlenderSync::get_buffer_params(BL::RenderSettings& b_render, } CCL_NAMESPACE_END - diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index 7f9018964c7..35bf7beda41 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -125,7 +125,7 @@ void BlenderSync::sync_light(BL::Object& b_parent, *use_portal = true; return; } - + BL::Lamp b_lamp(b_ob.data()); /* type */ @@ -185,7 +185,7 @@ void BlenderSync::sync_light(BL::Object& b_parent, PointerRNA clamp = RNA_pointer_get(&b_lamp.ptr, "cycles"); light->cast_shadow = get_boolean(clamp, "cast_shadow"); light->use_mis = get_boolean(clamp, "use_multiple_importance_sampling"); - + int samples = get_int(clamp, "samples"); if(get_boolean(cscene, "use_square_samples")) light->samples = samples * samples; @@ -287,7 +287,7 @@ Object *BlenderSync::sync_object(BL::Object& b_parent, { BL::Object b_ob = (b_dupli_ob ? b_dupli_ob.object() : b_parent); bool motion = motion_time != 0.0f; - + /* light is handled separately */ if(object_is_light(b_ob)) { /* don't use lamps for excluded layers used as mask layer */ @@ -360,7 +360,7 @@ Object *BlenderSync::sync_object(BL::Object& b_parent, if(object_map.sync(&object, b_ob, b_parent, key)) object_updated = true; - + /* mesh sync */ object->mesh = sync_mesh(b_ob, object_updated, hide_tris); @@ -502,7 +502,7 @@ static bool object_render_hide(BL::Object& b_ob, } parent = parent.parent(); } - + hide_triangles = hide_emitter; if(show_emitter) { @@ -530,7 +530,7 @@ void BlenderSync::sync_objects(float motion_time) /* layer data */ uint scene_layer = render_layer.scene_layer; bool motion = motion_time != 0.0f; - + if(!motion) { /* prepare for sync */ light_map.pre_sync(); @@ -755,4 +755,3 @@ void BlenderSync::sync_motion(BL::RenderSettings& b_render, } CCL_NAMESPACE_END - diff --git a/intern/cycles/blender/blender_object_cull.cpp b/intern/cycles/blender/blender_object_cull.cpp index bdf7dc469b2..680d9d7b1ff 100644 --- a/intern/cycles/blender/blender_object_cull.cpp +++ b/intern/cycles/blender/blender_object_cull.cpp @@ -146,4 +146,3 @@ bool BlenderObjectCulling::test_distance(Scene *scene, float3 bb[8]) } CCL_NAMESPACE_END - diff --git a/intern/cycles/blender/blender_particles.cpp b/intern/cycles/blender/blender_particles.cpp index 00f8cb3cf1b..727d9acf729 100644 --- a/intern/cycles/blender/blender_particles.cpp +++ b/intern/cycles/blender/blender_particles.cpp @@ -68,7 +68,7 @@ bool BlenderSync::sync_dupli_particle(BL::Object& b_ob, /* add particle */ BL::Particle b_pa = b_psys.particles[persistent_id[0]]; Particle pa; - + pa.index = persistent_id[0]; pa.age = b_scene.frame_current() - b_pa.birth_time(); pa.lifetime = b_pa.lifetime(); diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp index 76cc18dd9a1..3eccecb8850 100644 --- a/intern/cycles/blender/blender_python.cpp +++ b/intern/cycles/blender/blender_python.cpp @@ -331,7 +331,7 @@ static PyObject *draw_func(PyObject * /*self*/, PyObject *args) if(!PyArg_ParseTuple(args, "OOO", &pysession, &pyv3d, &pyrv3d)) return NULL; - + BlenderSession *session = (BlenderSession*)PyLong_AsVoidPtr(pysession); if(PyLong_AsVoidPtr(pyrv3d)) { @@ -590,7 +590,7 @@ static PyObject *osl_compile_func(PyObject * /*self*/, PyObject *args) if(!PyArg_ParseTuple(args, "ss", &inputfile, &outputfile)) return NULL; - + /* return */ if(!OSLShaderManager::osl_compile(inputfile, outputfile)) Py_RETURN_FALSE; diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 89612b74c39..8afcb0ce885 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -154,7 +154,7 @@ static SocketType::Type convert_socket_type(BL::NodeSocket& b_socket) return SocketType::STRING; case BL::NodeSocket::type_SHADER: return SocketType::CLOSURE; - + default: return SocketType::UNDEFINED; } @@ -443,7 +443,7 @@ static ShaderNode *add_node(Scene *scene, else if(b_node.is_a(&RNA_ShaderNodeBsdfGlossy)) { BL::ShaderNodeBsdfGlossy b_glossy_node(b_node); GlossyBsdfNode *glossy = new GlossyBsdfNode(); - + switch(b_glossy_node.distribution()) { case BL::ShaderNodeBsdfGlossy::distribution_SHARP: glossy->distribution = CLOSURE_BSDF_REFLECTION_ID; @@ -943,7 +943,7 @@ static ShaderInput *node_find_input_by_name(ShaderNode *node, BL::NodeSocket& b_socket) { string name = b_socket.name(); - + if(node_use_modified_socket_name(node)) { BL::Node::inputs_iterator b_input; bool found = false; @@ -1062,7 +1062,7 @@ static void add_nodes(Scene *scene, } } else if(b_node->is_a(&RNA_ShaderNodeGroup) || b_node->is_a(&RNA_NodeCustomGroup)) { - + BL::ShaderNodeTree b_group_ntree(PointerRNA_NULL); if(b_node->is_a(&RNA_ShaderNodeGroup)) b_group_ntree = BL::ShaderNodeTree(((BL::NodeGroup)(*b_node)).node_tree()); @@ -1104,7 +1104,7 @@ static void add_nodes(Scene *scene, output_map[b_output->ptr.data] = proxy->outputs[0]; } - + if(b_group_ntree) { add_nodes(scene, b_engine, @@ -1481,4 +1481,3 @@ void BlenderSync::sync_shaders() } CCL_NAMESPACE_END - diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs