[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31211] branches/soc-2010-nexyon: svn merge -r 31145:31210 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Joerg Mueller
nexyon at gmail.com
Tue Aug 10 11:47:57 CEST 2010
Revision: 31211
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31211
Author: nexyon
Date: 2010-08-10 11:47:57 +0200 (Tue, 10 Aug 2010)
Log Message:
-----------
svn merge -r 31145:31210 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/soc-2010-nexyon/release/scripts/io/export_3ds.py
branches/soc-2010-nexyon/release/scripts/io/export_fbx.py
branches/soc-2010-nexyon/release/scripts/io/export_mdd.py
branches/soc-2010-nexyon/release/scripts/io/export_obj.py
branches/soc-2010-nexyon/release/scripts/io/export_ply.py
branches/soc-2010-nexyon/release/scripts/io/import_shape_mdd.py
branches/soc-2010-nexyon/release/scripts/io/netrender/operators.py
branches/soc-2010-nexyon/release/scripts/io/netrender/ui.py
branches/soc-2010-nexyon/release/scripts/modules/bpy/path.py
branches/soc-2010-nexyon/release/scripts/modules/bpy/utils.py
branches/soc-2010-nexyon/release/scripts/modules/rna_info.py
branches/soc-2010-nexyon/release/scripts/modules/rna_prop_ui.py
branches/soc-2010-nexyon/release/scripts/op/fcurve_euler_filter.py
branches/soc-2010-nexyon/release/scripts/op/mesh.py
branches/soc-2010-nexyon/release/scripts/op/object.py
branches/soc-2010-nexyon/release/scripts/op/object_align.py
branches/soc-2010-nexyon/release/scripts/op/sequencer.py
branches/soc-2010-nexyon/release/scripts/op/uv.py
branches/soc-2010-nexyon/release/scripts/op/uvcalc_follow_active.py
branches/soc-2010-nexyon/release/scripts/op/uvcalc_smart_project.py
branches/soc-2010-nexyon/release/scripts/templates/operator.py
branches/soc-2010-nexyon/release/scripts/templates/operator_simple.py
branches/soc-2010-nexyon/release/scripts/templates/operator_uv.py
branches/soc-2010-nexyon/release/scripts/ui/properties_data_armature.py
branches/soc-2010-nexyon/release/scripts/ui/properties_data_armature_rigify.py
branches/soc-2010-nexyon/release/scripts/ui/properties_data_bone.py
branches/soc-2010-nexyon/release/scripts/ui/properties_data_camera.py
branches/soc-2010-nexyon/release/scripts/ui/properties_data_curve.py
branches/soc-2010-nexyon/release/scripts/ui/properties_data_empty.py
branches/soc-2010-nexyon/release/scripts/ui/properties_data_lamp.py
branches/soc-2010-nexyon/release/scripts/ui/properties_data_lattice.py
branches/soc-2010-nexyon/release/scripts/ui/properties_data_mesh.py
branches/soc-2010-nexyon/release/scripts/ui/properties_data_metaball.py
branches/soc-2010-nexyon/release/scripts/ui/properties_data_modifier.py
branches/soc-2010-nexyon/release/scripts/ui/properties_game.py
branches/soc-2010-nexyon/release/scripts/ui/properties_material.py
branches/soc-2010-nexyon/release/scripts/ui/properties_object.py
branches/soc-2010-nexyon/release/scripts/ui/properties_object_constraint.py
branches/soc-2010-nexyon/release/scripts/ui/properties_particle.py
branches/soc-2010-nexyon/release/scripts/ui/properties_physics_cloth.py
branches/soc-2010-nexyon/release/scripts/ui/properties_physics_field.py
branches/soc-2010-nexyon/release/scripts/ui/properties_physics_fluid.py
branches/soc-2010-nexyon/release/scripts/ui/properties_physics_smoke.py
branches/soc-2010-nexyon/release/scripts/ui/properties_physics_softbody.py
branches/soc-2010-nexyon/release/scripts/ui/properties_render.py
branches/soc-2010-nexyon/release/scripts/ui/properties_scene.py
branches/soc-2010-nexyon/release/scripts/ui/properties_texture.py
branches/soc-2010-nexyon/release/scripts/ui/properties_world.py
branches/soc-2010-nexyon/release/scripts/ui/space_console.py
branches/soc-2010-nexyon/release/scripts/ui/space_image.py
branches/soc-2010-nexyon/release/scripts/ui/space_logic.py
branches/soc-2010-nexyon/release/scripts/ui/space_sequencer.py
branches/soc-2010-nexyon/release/scripts/ui/space_text.py
branches/soc-2010-nexyon/release/scripts/ui/space_userpref.py
branches/soc-2010-nexyon/release/scripts/ui/space_userpref_keymap.py
branches/soc-2010-nexyon/release/scripts/ui/space_view3d.py
branches/soc-2010-nexyon/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-nexyon/source/blender/blenfont/intern/blf_font.c
branches/soc-2010-nexyon/source/blender/blenkernel/BKE_cloth.h
branches/soc-2010-nexyon/source/blender/blenkernel/BKE_collision.h
branches/soc-2010-nexyon/source/blender/blenkernel/BKE_effect.h
branches/soc-2010-nexyon/source/blender/blenkernel/BKE_sca.h
branches/soc-2010-nexyon/source/blender/blenkernel/intern/cloth.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/collision.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/implicit.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/lattice.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/modifier.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/object.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/particle.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/pointcache.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/sequencer.c
branches/soc-2010-nexyon/source/blender/blenkernel/intern/softbody.c
branches/soc-2010-nexyon/source/blender/blenlib/intern/path_util.c
branches/soc-2010-nexyon/source/blender/blenloader/intern/readfile.c
branches/soc-2010-nexyon/source/blender/blenloader/intern/undofile.c
branches/soc-2010-nexyon/source/blender/blenloader/intern/writefile.c
branches/soc-2010-nexyon/source/blender/collada/DocumentExporter.cpp
branches/soc-2010-nexyon/source/blender/editors/animation/anim_filter.c
branches/soc-2010-nexyon/source/blender/editors/animation/keyframes_draw.c
branches/soc-2010-nexyon/source/blender/editors/animation/keyframes_edit.c
branches/soc-2010-nexyon/source/blender/editors/animation/keyframes_general.c
branches/soc-2010-nexyon/source/blender/editors/animation/keyframing.c
branches/soc-2010-nexyon/source/blender/editors/animation/keyingsets.c
branches/soc-2010-nexyon/source/blender/editors/armature/armature_ops.c
branches/soc-2010-nexyon/source/blender/editors/armature/editarmature.c
branches/soc-2010-nexyon/source/blender/editors/armature/editarmature_generate.c
branches/soc-2010-nexyon/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2010-nexyon/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2010-nexyon/source/blender/editors/armature/meshlaplacian.c
branches/soc-2010-nexyon/source/blender/editors/armature/poseSlide.c
branches/soc-2010-nexyon/source/blender/editors/armature/poseUtils.c
branches/soc-2010-nexyon/source/blender/editors/armature/poselib.c
branches/soc-2010-nexyon/source/blender/editors/armature/poseobject.c
branches/soc-2010-nexyon/source/blender/editors/armature/reeb.c
branches/soc-2010-nexyon/source/blender/editors/curve/curve_ops.c
branches/soc-2010-nexyon/source/blender/editors/curve/editcurve.c
branches/soc-2010-nexyon/source/blender/editors/curve/editfont.c
branches/soc-2010-nexyon/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2010-nexyon/source/blender/editors/gpencil/editaction_gpencil.c
branches/soc-2010-nexyon/source/blender/editors/gpencil/gpencil_buttons.c
branches/soc-2010-nexyon/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2010-nexyon/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2010-nexyon/source/blender/editors/include/ED_view3d.h
branches/soc-2010-nexyon/source/blender/editors/interface/interface.c
branches/soc-2010-nexyon/source/blender/editors/interface/interface_anim.c
branches/soc-2010-nexyon/source/blender/editors/interface/interface_draw.c
branches/soc-2010-nexyon/source/blender/editors/interface/interface_handlers.c
branches/soc-2010-nexyon/source/blender/editors/interface/interface_icons.c
branches/soc-2010-nexyon/source/blender/editors/interface/interface_layout.c
branches/soc-2010-nexyon/source/blender/editors/interface/interface_ops.c
branches/soc-2010-nexyon/source/blender/editors/interface/interface_panel.c
branches/soc-2010-nexyon/source/blender/editors/interface/interface_regions.c
branches/soc-2010-nexyon/source/blender/editors/interface/interface_style.c
branches/soc-2010-nexyon/source/blender/editors/interface/interface_templates.c
branches/soc-2010-nexyon/source/blender/editors/interface/interface_widgets.c
branches/soc-2010-nexyon/source/blender/editors/interface/view2d_ops.c
branches/soc-2010-nexyon/source/blender/editors/mesh/editface.c
branches/soc-2010-nexyon/source/blender/editors/mesh/editmesh.c
branches/soc-2010-nexyon/source/blender/editors/mesh/editmesh_add.c
branches/soc-2010-nexyon/source/blender/editors/mesh/editmesh_loop.c
branches/soc-2010-nexyon/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2010-nexyon/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2010-nexyon/source/blender/editors/mesh/loopcut.c
branches/soc-2010-nexyon/source/blender/editors/mesh/mesh_data.c
branches/soc-2010-nexyon/source/blender/editors/mesh/mesh_ops.c
branches/soc-2010-nexyon/source/blender/editors/mesh/meshtools.c
branches/soc-2010-nexyon/source/blender/editors/metaball/mball_edit.c
branches/soc-2010-nexyon/source/blender/editors/object/object_add.c
branches/soc-2010-nexyon/source/blender/editors/object/object_bake.c
branches/soc-2010-nexyon/source/blender/editors/object/object_constraint.c
branches/soc-2010-nexyon/source/blender/editors/object/object_edit.c
branches/soc-2010-nexyon/source/blender/editors/object/object_group.c
branches/soc-2010-nexyon/source/blender/editors/object/object_hook.c
branches/soc-2010-nexyon/source/blender/editors/object/object_intern.h
branches/soc-2010-nexyon/source/blender/editors/object/object_lattice.c
branches/soc-2010-nexyon/source/blender/editors/object/object_modifier.c
branches/soc-2010-nexyon/source/blender/editors/object/object_ops.c
branches/soc-2010-nexyon/source/blender/editors/object/object_relations.c
branches/soc-2010-nexyon/source/blender/editors/object/object_select.c
branches/soc-2010-nexyon/source/blender/editors/object/object_shapekey.c
branches/soc-2010-nexyon/source/blender/editors/object/object_transform.c
branches/soc-2010-nexyon/source/blender/editors/object/object_vgroup.c
branches/soc-2010-nexyon/source/blender/editors/render/render_internal.c
branches/soc-2010-nexyon/source/blender/editors/render/render_opengl.c
branches/soc-2010-nexyon/source/blender/editors/render/render_preview.c
branches/soc-2010-nexyon/source/blender/editors/render/render_shading.c
branches/soc-2010-nexyon/source/blender/editors/screen/area.c
branches/soc-2010-nexyon/source/blender/editors/screen/screen_context.c
branches/soc-2010-nexyon/source/blender/editors/screen/screen_edit.c
branches/soc-2010-nexyon/source/blender/editors/screen/screen_ops.c
branches/soc-2010-nexyon/source/blender/editors/screen/screendump.c
branches/soc-2010-nexyon/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2010-nexyon/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2010-nexyon/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2010-nexyon/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2010-nexyon/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2010-nexyon/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2010-nexyon/source/blender/editors/sound/sound_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_action/action_draw.c
branches/soc-2010-nexyon/source/blender/editors/space_action/action_edit.c
branches/soc-2010-nexyon/source/blender/editors/space_action/action_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_action/action_select.c
branches/soc-2010-nexyon/source/blender/editors/space_action/space_action.c
branches/soc-2010-nexyon/source/blender/editors/space_api/space.c
branches/soc-2010-nexyon/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2010-nexyon/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2010-nexyon/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2010-nexyon/source/blender/editors/space_console/console_draw.c
branches/soc-2010-nexyon/source/blender/editors/space_console/console_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_console/console_report.c
branches/soc-2010-nexyon/source/blender/editors/space_console/space_console.c
branches/soc-2010-nexyon/source/blender/editors/space_file/file_draw.c
branches/soc-2010-nexyon/source/blender/editors/space_file/filelist.c
branches/soc-2010-nexyon/source/blender/editors/space_file/filesel.c
branches/soc-2010-nexyon/source/blender/editors/space_file/fsmenu.c
branches/soc-2010-nexyon/source/blender/editors/space_file/space_file.c
branches/soc-2010-nexyon/source/blender/editors/space_file/writeimage.c
branches/soc-2010-nexyon/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2010-nexyon/source/blender/editors/space_graph/graph_draw.c
branches/soc-2010-nexyon/source/blender/editors/space_graph/graph_edit.c
branches/soc-2010-nexyon/source/blender/editors/space_graph/graph_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_graph/graph_select.c
branches/soc-2010-nexyon/source/blender/editors/space_graph/graph_utils.c
branches/soc-2010-nexyon/source/blender/editors/space_graph/space_graph.c
branches/soc-2010-nexyon/source/blender/editors/space_image/image_buttons.c
branches/soc-2010-nexyon/source/blender/editors/space_image/image_draw.c
branches/soc-2010-nexyon/source/blender/editors/space_image/image_header.c
branches/soc-2010-nexyon/source/blender/editors/space_image/image_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_image/image_render.c
branches/soc-2010-nexyon/source/blender/editors/space_image/space_image.c
branches/soc-2010-nexyon/source/blender/editors/space_info/info_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_info/info_stats.c
branches/soc-2010-nexyon/source/blender/editors/space_info/space_info.c
branches/soc-2010-nexyon/source/blender/editors/space_logic/logic_buttons.c
branches/soc-2010-nexyon/source/blender/editors/space_logic/logic_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_logic/logic_window.c
branches/soc-2010-nexyon/source/blender/editors/space_logic/space_logic.c
branches/soc-2010-nexyon/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2010-nexyon/source/blender/editors/space_nla/nla_channels.c
branches/soc-2010-nexyon/source/blender/editors/space_nla/nla_draw.c
branches/soc-2010-nexyon/source/blender/editors/space_nla/nla_edit.c
branches/soc-2010-nexyon/source/blender/editors/space_nla/nla_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_nla/nla_select.c
branches/soc-2010-nexyon/source/blender/editors/space_nla/space_nla.c
branches/soc-2010-nexyon/source/blender/editors/space_node/drawnode.c
branches/soc-2010-nexyon/source/blender/editors/space_node/node_buttons.c
branches/soc-2010-nexyon/source/blender/editors/space_node/node_draw.c
branches/soc-2010-nexyon/source/blender/editors/space_node/node_edit.c
branches/soc-2010-nexyon/source/blender/editors/space_node/node_header.c
branches/soc-2010-nexyon/source/blender/editors/space_node/node_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_node/node_select.c
branches/soc-2010-nexyon/source/blender/editors/space_node/node_state.c
branches/soc-2010-nexyon/source/blender/editors/space_node/space_node.c
branches/soc-2010-nexyon/source/blender/editors/space_outliner/outliner.c
branches/soc-2010-nexyon/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2010-nexyon/source/blender/editors/space_script/script_edit.c
branches/soc-2010-nexyon/source/blender/editors/space_script/script_header.c
branches/soc-2010-nexyon/source/blender/editors/space_script/script_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_script/space_script.c
branches/soc-2010-nexyon/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2010-nexyon/source/blender/editors/space_sequencer/sequencer_buttons.c
branches/soc-2010-nexyon/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2010-nexyon/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2010-nexyon/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2010-nexyon/source/blender/editors/space_sound/sound_header.c
branches/soc-2010-nexyon/source/blender/editors/space_sound/space_sound.c
branches/soc-2010-nexyon/source/blender/editors/space_text/space_text.c
branches/soc-2010-nexyon/source/blender/editors/space_text/text_draw.c
branches/soc-2010-nexyon/source/blender/editors/space_text/text_header.c
branches/soc-2010-nexyon/source/blender/editors/space_text/text_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_time/space_time.c
branches/soc-2010-nexyon/source/blender/editors/space_time/time_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/drawanimviz.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/drawobject.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2010-nexyon/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2010-nexyon/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2010-nexyon/source/blender/editors/transform/transform.c
branches/soc-2010-nexyon/source/blender/editors/transform/transform_constraints.c
branches/soc-2010-nexyon/source/blender/editors/transform/transform_conversions.c
branches/soc-2010-nexyon/source/blender/editors/transform/transform_generics.c
branches/soc-2010-nexyon/source/blender/editors/transform/transform_manipulator.c
branches/soc-2010-nexyon/source/blender/editors/transform/transform_ops.c
branches/soc-2010-nexyon/source/blender/editors/transform/transform_orientations.c
branches/soc-2010-nexyon/source/blender/editors/transform/transform_snap.c
branches/soc-2010-nexyon/source/blender/editors/util/ed_util.c
branches/soc-2010-nexyon/source/blender/editors/util/editmode_undo.c
branches/soc-2010-nexyon/source/blender/editors/util/numinput.c
branches/soc-2010-nexyon/source/blender/editors/util/undo.c
branches/soc-2010-nexyon/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2010-nexyon/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2010-nexyon/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2010-nexyon/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2010-nexyon/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2010-nexyon/source/blender/gpu/intern/gpu_draw.c
branches/soc-2010-nexyon/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2010-nexyon/source/blender/gpu/intern/gpu_material.c
branches/soc-2010-nexyon/source/blender/imbuf/intern/thumbs.c
branches/soc-2010-nexyon/source/blender/makesdna/DNA_curve_types.h
branches/soc-2010-nexyon/source/blender/makesdna/DNA_lattice_types.h
branches/soc-2010-nexyon/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_object.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_particle.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_ui.c
branches/soc-2010-nexyon/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2010-nexyon/source/blender/makesrna/rna_cleanup/rna_cleaner.py
branches/soc-2010-nexyon/source/blender/makesrna/rna_cleanup/rna_properties.txt
branches/soc-2010-nexyon/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2010-nexyon/source/blender/modifiers/intern/MOD_collision.c
branches/soc-2010-nexyon/source/blender/python/generic/mathutils.c
branches/soc-2010-nexyon/source/blender/python/generic/mathutils_color.c
branches/soc-2010-nexyon/source/blender/python/generic/mathutils_euler.c
branches/soc-2010-nexyon/source/blender/python/generic/mathutils_matrix.c
branches/soc-2010-nexyon/source/blender/python/generic/mathutils_quat.c
branches/soc-2010-nexyon/source/blender/python/generic/mathutils_vector.c
branches/soc-2010-nexyon/source/blender/python/intern/bpy.c
branches/soc-2010-nexyon/source/blender/python/intern/bpy_rna.c
branches/soc-2010-nexyon/source/blender/python/intern/bpy_rna_callback.c
Added Paths:
-----------
branches/soc-2010-nexyon/release/scripts/modules/bpy_xml_ui.py
branches/soc-2010-nexyon/release/scripts/ui/properties_render_test.xml
branches/soc-2010-nexyon/source/blender/editors/include/ED_lattice.h
branches/soc-2010-nexyon/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py
Removed Paths:
-------------
branches/soc-2010-nexyon/source/blender/makesrna/rna_cleanup/rna_booleans.txt
Modified: branches/soc-2010-nexyon/release/scripts/io/export_3ds.py
===================================================================
--- branches/soc-2010-nexyon/release/scripts/io/export_3ds.py 2010-08-10 07:57:02 UTC (rev 31210)
+++ branches/soc-2010-nexyon/release/scripts/io/export_3ds.py 2010-08-10 09:47:57 UTC (rev 31211)
@@ -1133,8 +1133,8 @@
wm.add_fileselect(self)
return {'RUNNING_MODAL'}
- @staticmethod
- def poll(context): # Poll isnt working yet
+ @classmethod
+ def poll(cls, context): # Poll isnt working yet
return context.active_object != None
# Add to a menu
Modified: branches/soc-2010-nexyon/release/scripts/io/export_fbx.py
===================================================================
--- branches/soc-2010-nexyon/release/scripts/io/export_fbx.py 2010-08-10 07:57:02 UTC (rev 31210)
+++ branches/soc-2010-nexyon/release/scripts/io/export_fbx.py 2010-08-10 09:47:57 UTC (rev 31211)
@@ -3361,8 +3361,8 @@
BATCH_FILE_PREFIX = StringProperty(name="Prefix", description="Prefix each file with this name", maxlen=1024, default="")
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
return context.active_object
def execute(self, context):
Modified: branches/soc-2010-nexyon/release/scripts/io/export_mdd.py
===================================================================
--- branches/soc-2010-nexyon/release/scripts/io/export_mdd.py 2010-08-10 07:57:02 UTC (rev 31210)
+++ branches/soc-2010-nexyon/release/scripts/io/export_mdd.py 2010-08-10 09:47:57 UTC (rev 31211)
@@ -165,8 +165,8 @@
frame_start = IntProperty(name="Start Frame", description="Start frame for baking", min=minframe, max=maxframe, default=1)
frame_end = IntProperty(name="End Frame", description="End frame for baking", min=minframe, max=maxframe, default=250)
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
ob = context.active_object
return (ob and ob.type == 'MESH')
Modified: branches/soc-2010-nexyon/release/scripts/io/export_obj.py
===================================================================
--- branches/soc-2010-nexyon/release/scripts/io/export_obj.py 2010-08-10 07:57:02 UTC (rev 31210)
+++ branches/soc-2010-nexyon/release/scripts/io/export_obj.py 2010-08-10 09:47:57 UTC (rev 31211)
@@ -44,7 +44,7 @@
# Returns a tuple - path,extension.
-# 'hello.obj' > ('hello', '.obj')
+# 'hello.obj' > ('hello', '.obj')
def splitExt(path):
dotidx = path.rfind('.')
if dotidx == -1:
@@ -81,7 +81,7 @@
file = open(filepath, "w")
# XXX
-# file.write('# Blender MTL File: %s\n' % Blender.Get('filepath').split('\\')[-1].split('/')[-1])
+# file.write('# Blender MTL File: %s\n' % Blender.Get('filepath').split('\\')[-1].split('/')[-1])
file.write('# Material Count: %i\n' % len(mtl_dict))
# Write material/image combinations we have used.
for key, (mtl_mat_name, mat, img) in mtl_dict.items():
@@ -93,7 +93,7 @@
if mat:
file.write('Ns %.6f\n' % ((mat.specular_hardness-1) * 1.9607843137254901) ) # Hardness, convert blenders 1-511 to MTL's
- file.write('Ka %.6f %.6f %.6f\n' % tuple([c*mat.ambient for c in worldAmb]) ) # Ambient, uses mirror colour,
+ file.write('Ka %.6f %.6f %.6f\n' % tuple([c*mat.ambient for c in worldAmb]) ) # Ambient, uses mirror colour,
file.write('Kd %.6f %.6f %.6f\n' % tuple([c*mat.diffuse_intensity for c in mat.diffuse_color]) ) # Diffuse
file.write('Ks %.6f %.6f %.6f\n' % tuple([c*mat.specular_intensity for c in mat.specular_color]) ) # Specular
if hasattr(mat, "ior"):
@@ -113,25 +113,25 @@
else:
#write a dummy material here?
file.write('Ns 0\n')
- file.write('Ka %.6f %.6f %.6f\n' % tuple([c for c in worldAmb]) ) # Ambient, uses mirror colour,
+ file.write('Ka %.6f %.6f %.6f\n' % tuple([c for c in worldAmb]) ) # Ambient, uses mirror colour,
file.write('Kd 0.8 0.8 0.8\n')
file.write('Ks 0.8 0.8 0.8\n')
file.write('d 1\n') # No alpha
file.write('illum 2\n') # light normaly
# Write images!
- if img: # We have an image on the face!
+ if img: # We have an image on the face!
# write relative image path
rel = copy_image(img)
file.write('map_Kd %s\n' % rel) # Diffuse mapping image
-# file.write('map_Kd %s\n' % img.filepath.split('\\')[-1].split('/')[-1]) # Diffuse mapping image
+# file.write('map_Kd %s\n' % img.filepath.split('\\')[-1].split('/')[-1]) # Diffuse mapping image
elif mat: # No face image. if we havea material search for MTex image.
for mtex in mat.texture_slots:
if mtex and mtex.texture.type == 'IMAGE':
try:
filepath = copy_image(mtex.texture.image)
-# filepath = mtex.texture.image.filepath.split('\\')[-1].split('/')[-1]
+# filepath = mtex.texture.image.filepath.split('\\')[-1].split('/')[-1]
file.write('map_Kd %s\n' % filepath) # Diffuse mapping image
break
except:
@@ -157,8 +157,8 @@
def copy_images(dest_dir):
if dest_dir[-1] != os.sep:
dest_dir += os.sep
-# if dest_dir[-1] != sys.sep:
-# dest_dir += sys.sep
+# if dest_dir[-1] != sys.sep:
+# dest_dir += sys.sep
# Get unique image names
uniqueImages = {}
@@ -181,20 +181,20 @@
# Now copy images
copyCount = 0
-# for bImage in uniqueImages.values():
-# image_path = bpy.path.abspath(bImage.filepath)
-# if bpy.sys.exists(image_path):
-# # Make a name for the target path.
-# dest_image_path = dest_dir + image_path.split('\\')[-1].split('/')[-1]
-# if not bpy.utils.exists(dest_image_path): # Image isnt already there
-# print('\tCopying "%s" > "%s"' % (image_path, dest_image_path))
-# copy_file(image_path, dest_image_path)
-# copyCount+=1
+# for bImage in uniqueImages.values():
+# image_path = bpy.path.abspath(bImage.filepath)
+# if bpy.sys.exists(image_path):
+# # Make a name for the target path.
+# dest_image_path = dest_dir + image_path.split('\\')[-1].split('/')[-1]
+# if not bpy.utils.exists(dest_image_path): # Image isnt already there
+# print('\tCopying "%s" > "%s"' % (image_path, dest_image_path))
+# copy_file(image_path, dest_image_path)
+# copyCount+=1
-# paths= bpy.util.copy_images(uniqueImages.values(), dest_dir)
+# paths= bpy.util.copy_images(uniqueImages.values(), dest_dir)
print('\tCopied %d images' % copyCount)
-# print('\tCopied %d images' % copyCount)
+# print('\tCopied %d images' % copyCount)
# XXX not converted
def test_nurbs_compat(ob):
@@ -217,8 +217,8 @@
Vector = Blender.mathutils.Vector
for nu in cu:
- if nu.type==0: DEG_ORDER_U = 1
- else: DEG_ORDER_U = nu.orderU-1 # Tested to be correct
+ if nu.type==0: DEG_ORDER_U = 1
+ else: DEG_ORDER_U = nu.orderU-1 # Tested to be correct
if nu.type==1:
print("\tWarning, bezier curve:", ob.name, "only poly and nurbs curves supported")
@@ -275,7 +275,7 @@
return tot_verts
-def write(filepath, objects, scene,
+def write_file(filepath, objects, scene,
EXPORT_TRI=False,
EXPORT_EDGES=False,
EXPORT_NORMALS=False,
@@ -319,9 +319,9 @@
"""
weightDict = {}
for vert_index in face.verts:
-# for vert in face:
+# for vert in face:
vWeights = vWeightMap[vert_index]
-# vWeights = vWeightMap[vert]
+# vWeights = vWeightMap[vert]
for vGroupName, weight in vWeights:
weightDict[vGroupName] = weightDict.get(vGroupName, 0) + weight
@@ -348,8 +348,8 @@
temp_mesh_name = '~tmp-mesh'
time1 = time.clock()
-# time1 = sys.time()
-# scn = Scene.GetCurrent()
+# time1 = sys.time()
+# scn = Scene.GetCurrent()
file = open(filepath, "w")
@@ -401,15 +401,15 @@
for ob, ob_mat in obs:
# XXX postponed
-# # Nurbs curve support
-# if EXPORT_CURVE_AS_NURBS and test_nurbs_compat(ob):
-# if EXPORT_ROTX90:
-# ob_mat = ob_mat * mat_xrot90
+# # Nurbs curve support
+# if EXPORT_CURVE_AS_NURBS and test_nurbs_compat(ob):
+# if EXPORT_ROTX90:
+# ob_mat = ob_mat * mat_xrot90
-# totverts += write_nurb(file, ob, ob_mat)
+# totverts += write_nurb(file, ob, ob_mat)
-# continue
-# end nurbs
+# continue
+# end nurbs
if ob.type != 'MESH':
continue
@@ -421,10 +421,10 @@
else:
me.transform(ob_mat)
-# # Will work for non meshes now! :)
-# me= BPyMesh.getMeshFromObject(ob, containerMesh, EXPORT_APPLY_MODIFIERS, EXPORT_POLYGROUPS, scn)
-# if not me:
-# continue
+# # Will work for non meshes now! :)
+# me= BPyMesh.getMeshFromObject(ob, containerMesh, EXPORT_APPLY_MODIFIERS, EXPORT_POLYGROUPS, scn)
+# if not me:
+# continue
if EXPORT_UV:
faceuv = len(me.uv_textures) > 0
@@ -472,13 +472,13 @@
# High Quality Normals
if EXPORT_NORMALS and face_index_pairs:
me.calc_normals()
-# if EXPORT_NORMALS_HQ:
-# BPyMesh.meshCalcNormals(me)
-# else:
-# # transforming normals is incorrect
-# # when the matrix is scaled,
-# # better to recalculate them
-# me.calcNormals()
+# if EXPORT_NORMALS_HQ:
+# BPyMesh.meshCalcNormals(me)
+# else:
+# # transforming normals is incorrect
+# # when the matrix is scaled,
+# # better to recalculate them
+# me.calcNormals()
materials = me.materials
@@ -512,18 +512,18 @@
else:
# no materials
face_index_pairs.sort(key = lambda a: a[0].smooth)
-# if EXPORT_KEEP_VERT_ORDER:
-# pass
-# elif faceuv:
-# try: faces.sort(key = lambda a: (a.mat, a.image, a.smooth))
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list