[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31187] branches/soc-2010-nicolasbishop: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r31091 :31183
Nicholas Bishop
nicholasbishop at gmail.com
Mon Aug 9 05:21:30 CEST 2010
Revision: 31187
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31187
Author: nicholasbishop
Date: 2010-08-09 05:21:30 +0200 (Mon, 09 Aug 2010)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r31091:31183
Modified Paths:
--------------
branches/soc-2010-nicolasbishop/release/scripts/io/export_3ds.py
branches/soc-2010-nicolasbishop/release/scripts/io/export_fbx.py
branches/soc-2010-nicolasbishop/release/scripts/io/export_mdd.py
branches/soc-2010-nicolasbishop/release/scripts/io/export_ply.py
branches/soc-2010-nicolasbishop/release/scripts/io/import_shape_mdd.py
branches/soc-2010-nicolasbishop/release/scripts/io/netrender/operators.py
branches/soc-2010-nicolasbishop/release/scripts/io/netrender/ui.py
branches/soc-2010-nicolasbishop/release/scripts/modules/bpy/path.py
branches/soc-2010-nicolasbishop/release/scripts/modules/bpy/utils.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rna_prop_ui.py
branches/soc-2010-nicolasbishop/release/scripts/op/fcurve_euler_filter.py
branches/soc-2010-nicolasbishop/release/scripts/op/mesh.py
branches/soc-2010-nicolasbishop/release/scripts/op/object.py
branches/soc-2010-nicolasbishop/release/scripts/op/object_align.py
branches/soc-2010-nicolasbishop/release/scripts/op/sequencer.py
branches/soc-2010-nicolasbishop/release/scripts/op/uv.py
branches/soc-2010-nicolasbishop/release/scripts/op/uvcalc_follow_active.py
branches/soc-2010-nicolasbishop/release/scripts/op/uvcalc_smart_project.py
branches/soc-2010-nicolasbishop/release/scripts/templates/operator.py
branches/soc-2010-nicolasbishop/release/scripts/templates/operator_simple.py
branches/soc-2010-nicolasbishop/release/scripts/templates/operator_uv.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_animviz.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_armature.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_armature_rigify.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_bone.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_camera.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_curve.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_empty.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_lamp.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_lattice.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_mesh.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_metaball.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_modifier.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_game.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_material.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_object.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_object_constraint.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_particle.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_cloth.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_common.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_field.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_fluid.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_smoke.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_softbody.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_render.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_scene.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_texture.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_world.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_console.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_image.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_logic.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_sequencer.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_text.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_userpref.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_userpref_keymap.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-nicolasbishop/source/blender/blenfont/intern/blf_font.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_curve.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/curve.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/lattice.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/object.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/sequencer.c
branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/readfile.c
branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/undofile.c
branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/writefile.c
branches/soc-2010-nicolasbishop/source/blender/editors/animation/anim_filter.c
branches/soc-2010-nicolasbishop/source/blender/editors/animation/keyframes_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/animation/keyframes_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/animation/keyframes_general.c
branches/soc-2010-nicolasbishop/source/blender/editors/animation/keyframing.c
branches/soc-2010-nicolasbishop/source/blender/editors/animation/keyingsets.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/armature_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/editarmature.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/editarmature_generate.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/meshlaplacian.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/poseSlide.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/poseUtils.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/poselib.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/poseobject.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/reeb.c
branches/soc-2010-nicolasbishop/source/blender/editors/curve/curve_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/curve/editcurve.c
branches/soc-2010-nicolasbishop/source/blender/editors/curve/editfont.c
branches/soc-2010-nicolasbishop/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2010-nicolasbishop/source/blender/editors/gpencil/editaction_gpencil.c
branches/soc-2010-nicolasbishop/source/blender/editors/gpencil/gpencil_buttons.c
branches/soc-2010-nicolasbishop/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_anim.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_handlers.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_icons.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_layout.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_panel.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_regions.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_style.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_templates.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_widgets.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/resources.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/view2d_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/editface.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/editmesh.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/editmesh_add.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/editmesh_loop.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/loopcut.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/mesh_data.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/mesh_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/meshtools.c
branches/soc-2010-nicolasbishop/source/blender/editors/metaball/mball_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_add.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_bake.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_constraint.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_group.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_hook.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_lattice.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_modifier.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_relations.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_select.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_shapekey.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_transform.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_vgroup.c
branches/soc-2010-nicolasbishop/source/blender/editors/physics/physics_fluid.c
branches/soc-2010-nicolasbishop/source/blender/editors/render/render_internal.c
branches/soc-2010-nicolasbishop/source/blender/editors/render/render_opengl.c
branches/soc-2010-nicolasbishop/source/blender/editors/render/render_preview.c
branches/soc-2010-nicolasbishop/source/blender/editors/render/render_shading.c
branches/soc-2010-nicolasbishop/source/blender/editors/screen/area.c
branches/soc-2010-nicolasbishop/source/blender/editors/screen/screen_context.c
branches/soc-2010-nicolasbishop/source/blender/editors/screen/screen_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/screen/screen_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/screen/screendump.c
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2010-nicolasbishop/source/blender/editors/sound/sound_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_action/action_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_action/action_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_action/action_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_action/action_select.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_action/space_action.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_api/space.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_console/console_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_console/console_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_console/console_report.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_console/space_console.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/file_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/filelist.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/filesel.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/fsmenu.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/space_file.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/writeimage.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_graph/graph_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_graph/graph_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_graph/graph_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_graph/graph_select.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_graph/graph_utils.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_graph/space_graph.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_image/image_buttons.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_image/image_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_image/image_header.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_image/image_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_image/image_render.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_image/space_image.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_info/info_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_info/info_stats.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_info/space_info.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_logic/logic_buttons.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_logic/logic_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_logic/logic_window.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_logic/space_logic.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_nla/nla_channels.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_nla/nla_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_nla/nla_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_nla/nla_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_nla/nla_select.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_nla/space_nla.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/drawnode.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/node_buttons.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/node_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/node_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/node_header.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/node_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/node_select.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/node_state.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/space_node.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_outliner/outliner.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_script/script_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_script/script_header.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_script/script_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_script/space_script.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_buttons.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sound/sound_header.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sound/space_sound.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_text/space_text.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_text/text_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_text/text_header.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_text/text_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_time/space_time.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_time/time_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/drawanimviz.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/drawobject.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_constraints.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_conversions.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_generics.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_manipulator.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_orientations.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_snap.c
branches/soc-2010-nicolasbishop/source/blender/editors/util/ed_util.c
branches/soc-2010-nicolasbishop/source/blender/editors/util/editmode_undo.c
branches/soc-2010-nicolasbishop/source/blender/editors/util/numinput.c
branches/soc-2010-nicolasbishop/source/blender/editors/util/undo.c
branches/soc-2010-nicolasbishop/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2010-nicolasbishop/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2010-nicolasbishop/source/blender/gpu/intern/gpu_draw.c
branches/soc-2010-nicolasbishop/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2010-nicolasbishop/source/blender/gpu/intern/gpu_material.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/thumbs.c
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_curve_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_action.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_context.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_curve.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_ui.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2010-nicolasbishop/source/blender/python/generic/mathutils.c
branches/soc-2010-nicolasbishop/source/blender/python/generic/mathutils_color.c
branches/soc-2010-nicolasbishop/source/blender/python/generic/mathutils_euler.c
branches/soc-2010-nicolasbishop/source/blender/python/generic/mathutils_matrix.c
branches/soc-2010-nicolasbishop/source/blender/python/generic/mathutils_quat.c
branches/soc-2010-nicolasbishop/source/blender/python/generic/mathutils_vector.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_rna.c
branches/soc-2010-nicolasbishop/source/blender/render/intern/source/convertblender.c
branches/soc-2010-nicolasbishop/source/blender/render/intern/source/texture.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_PythonInit.cpp
Added Paths:
-----------
branches/soc-2010-nicolasbishop/release/scripts/modules/bpy_xml_ui.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_render_test.xml
Modified: branches/soc-2010-nicolasbishop/release/scripts/io/export_3ds.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/io/export_3ds.py 2010-08-09 03:02:20 UTC (rev 31186)
+++ branches/soc-2010-nicolasbishop/release/scripts/io/export_3ds.py 2010-08-09 03:21:30 UTC (rev 31187)
@@ -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-nicolasbishop/release/scripts/io/export_fbx.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/io/export_fbx.py 2010-08-09 03:02:20 UTC (rev 31186)
+++ branches/soc-2010-nicolasbishop/release/scripts/io/export_fbx.py 2010-08-09 03:21:30 UTC (rev 31187)
@@ -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-nicolasbishop/release/scripts/io/export_mdd.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/io/export_mdd.py 2010-08-09 03:02:20 UTC (rev 31186)
+++ branches/soc-2010-nicolasbishop/release/scripts/io/export_mdd.py 2010-08-09 03:21:30 UTC (rev 31187)
@@ -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-nicolasbishop/release/scripts/io/export_ply.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/io/export_ply.py 2010-08-09 03:02:20 UTC (rev 31186)
+++ branches/soc-2010-nicolasbishop/release/scripts/io/export_ply.py 2010-08-09 03:21:30 UTC (rev 31187)
@@ -275,8 +275,8 @@
use_uvs = BoolProperty(name="UVs", description="Exort the active UV layer", default=True)
use_colors = BoolProperty(name="Vertex Colors", description="Exort the active vertex color layer", default=True)
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
return context.active_object != None
def execute(self, context):
Modified: branches/soc-2010-nicolasbishop/release/scripts/io/import_shape_mdd.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/io/import_shape_mdd.py 2010-08-09 03:02:20 UTC (rev 31186)
+++ branches/soc-2010-nicolasbishop/release/scripts/io/import_shape_mdd.py 2010-08-09 03:21:30 UTC (rev 31187)
@@ -120,8 +120,8 @@
#fps = IntProperty(name="Frames Per Second", description="Number of frames/second", min=minfps, max=maxfps, default=25)
frame_start = IntProperty(name="Start Frame", description="Start frame for inserting animation", min=minframe, max=maxframe, default=0)
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
ob = context.active_object
return (ob and ob.type == 'MESH')
Modified: branches/soc-2010-nicolasbishop/release/scripts/io/netrender/operators.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/io/netrender/operators.py 2010-08-09 03:02:20 UTC (rev 31186)
+++ branches/soc-2010-nicolasbishop/release/scripts/io/netrender/operators.py 2010-08-09 03:21:30 UTC (rev 31187)
@@ -31,8 +31,8 @@
bl_idname = "render.netslavebake"
bl_label = "Bake all in file"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
return True
def execute(self, context):
@@ -89,8 +89,8 @@
bl_idname = "render.netclientanim"
bl_label = "Animation on network"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
return True
def execute(self, context):
@@ -116,8 +116,8 @@
bl_idname = "render.netclientstart"
bl_label = "Start Service"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
return True
def execute(self, context):
@@ -133,8 +133,8 @@
bl_idname = "render.netclientsend"
bl_label = "Send job"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
return True
def execute(self, context):
@@ -163,8 +163,8 @@
bl_idname = "render.netclientsendframe"
bl_label = "Send current frame job"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
return True
def execute(self, context):
@@ -193,8 +193,8 @@
bl_idname = "render.netclientstatus"
bl_label = "Client Status"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
return True
def execute(self, context):
@@ -233,8 +233,8 @@
bl_idname = "render.netclientblacklistslave"
bl_label = "Client Blacklist Slave"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
return True
def execute(self, context):
@@ -263,8 +263,8 @@
bl_idname = "render.netclientwhitelistslave"
bl_label = "Client Whitelist Slave"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
return True
def execute(self, context):
@@ -294,8 +294,8 @@
bl_idname = "render.netclientslaves"
bl_label = "Client Slaves"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
return True
def execute(self, context):
@@ -339,8 +339,8 @@
bl_idname = "render.netclientcancel"
bl_label = "Client Cancel"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
netsettings = context.scene.network_render
return netsettings.active_job_index >= 0 and len(netsettings.jobs) > 0
@@ -368,8 +368,8 @@
bl_idname = "render.netclientcancelall"
bl_label = "Client Cancel All"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
return True
def execute(self, context):
@@ -395,8 +395,8 @@
bl_idname = "render.netclientdownload"
bl_label = "Client Download"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
netsettings = context.scene.network_render
return netsettings.active_job_index >= 0 and len(netsettings.jobs) > 0
@@ -440,8 +440,8 @@
bl_idname = "render.netclientscan"
bl_label = "Client Scan"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
return True
def execute(self, context):
@@ -463,8 +463,8 @@
bl_idname = "render.netclientweb"
bl_label = "Open Master Monitor"
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
netsettings = context.scene.network_render
return netsettings.server_address != "[default]"
Modified: branches/soc-2010-nicolasbishop/release/scripts/io/netrender/ui.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/io/netrender/ui.py 2010-08-09 03:02:20 UTC (rev 31186)
+++ branches/soc-2010-nicolasbishop/release/scripts/io/netrender/ui.py 2010-08-09 03:21:30 UTC (rev 31187)
@@ -36,6 +36,11 @@
DONE = 2
ERROR = 3
+def base_poll(cls, context):
+ rd = context.scene.render
+ return (rd.use_game_engine==False) and (rd.engine in cls.COMPAT_ENGINES)
+
+
def init_file():
if netrender.init_file != bpy.data.filepath:
netrender.init_file = bpy.data.filepath
@@ -88,10 +93,9 @@
bl_label = "Network Settings"
COMPAT_ENGINES = {'NET_RENDER'}
- @staticmethod
- def poll(context):
- rd = context.scene.render
- return (rd.use_game_engine==False) and (rd.engine in __class__.COMPAT_ENGINES)
+ @classmethod
+ def poll(cls, context):
+ return base_poll(cls, context)
def draw(self, context):
layout = self.layout
@@ -127,13 +131,10 @@
bl_label = "Slave Settings"
COMPAT_ENGINES = {'NET_RENDER'}
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
scene = context.scene
- ### return (super().poll(context)
- ### and scene.network_render.mode == "RENDER_SLAVE")
- ### FIXME ^^^
- return scene.network_render.mode == "RENDER_SLAVE"
+ return base_poll(cls, context) and scene.network_render.mode == "RENDER_SLAVE"
def draw(self, context):
layout = self.layout
@@ -155,13 +156,10 @@
bl_label = "Master Settings"
COMPAT_ENGINES = {'NET_RENDER'}
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
scene = context.scene
- ### return (super().poll(context)
- ### and scene.network_render.mode == "RENDER_MASTER")
- ### ^^^ FIXME
- return scene.network_render.mode == "RENDER_MASTER"
+ return base_poll(cls, context) and scene.network_render.mode == "RENDER_MASTER"
def draw(self, context):
layout = self.layout
@@ -176,13 +174,10 @@
bl_label = "Job Settings"
COMPAT_ENGINES = {'NET_RENDER'}
- @staticmethod
- def poll(context):
+ @classmethod
+ def poll(cls, context):
scene = context.scene
- ### return (super().poll(context)
- ### and scene.network_render.mode == "RENDER_CLIENT")
- ### ^^^ FIXME
- return scene.network_render.mode == "RENDER_CLIENT"
+ return base_poll(cls, context) and scene.network_render.mode == "RENDER_CLIENT"
def draw(self, context):
layout = self.layout
@@ -219,17 +214,14 @@
bl_label = "Slaves Status"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list