Blender Git Loki
Git Commits -> Revision f582e82
Revision f582e82 by Jason Wilkins (soc-2010-jwilkins) July 6, 2010, 16:40 (GMT) |
more merge fixes |
Commit Details:
Full Hash: f582e8227d0006d1eaef853a7c439c260e29a65d
SVN Revision: 30049
Parent Commit: a838ec5
Lines Changed: +2970, -1223
5 Added Paths:
/config/CMakeLists.txt (+912, -0) (View)
/doc/blender.1.py (+134, -0) (View)
/source/blender/blenlib/BLI_cpu.h (+30, -0) (View)
/source/blender/blenlib/intern/cpu.c (+57, -0) (View)
/source/blender/python/doc/examples/bpy.data.py (+28, -0) (View)
/doc/blender.1.py (+134, -0) (View)
/source/blender/blenlib/BLI_cpu.h (+30, -0) (View)
/source/blender/blenlib/intern/cpu.c (+57, -0) (View)
/source/blender/python/doc/examples/bpy.data.py (+28, -0) (View)
144 Modified Paths:
/CMakeLists.txt (+11, -2) (Diff)
/config/darwin-config.py (+7, -0) (Diff)
/config/linux2-config.py (+1, -1) (Diff)
/config/linuxcross-config.py (+1, -1) (Diff)
/config/win32-mingw-config.py (+2, -2) (Diff)
/config/win32-vc-config.py (+1, -1) (Diff)
/config/win64-vc-config.py (+1, -1) (Diff)
/doc/blender.1 (+218, -112) (Diff)
/source/blender/blenkernel/BKE_displist.h (+2, -1) (Diff)
/source/blender/blenkernel/BKE_image.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_lattice.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_mball.h (+3, -2) (Diff)
/source/blender/blenkernel/BKE_scene.h (+2, -0) (Diff)
/source/blender/blenkernel/BKE_sequencer.h (+8, -0) (Diff)
/source/blender/blenkernel/intern/action.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/anim.c (+5, -1) (Diff)
/source/blender/blenkernel/intern/blender.c (+5, -0) (Diff)
/source/blender/blenkernel/intern/cdderivedmesh.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/displist.c (+22, -9) (Diff)
/source/blender/blenkernel/intern/image.c (+6, -13) (Diff)
/source/blender/blenkernel/intern/lattice.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/mball.c (+18, -7) (Diff)
/source/blender/blenkernel/intern/node.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/object.c (+19, -30) (Diff)
/source/blender/blenkernel/intern/packedFile.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/particle.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/scene.c (+22, -17) (Diff)
/source/blender/blenkernel/intern/sequencer.c (+178, -12) (Diff)
/source/blender/blenkernel/intern/texture.c (+1, -0) (Diff)
/source/blender/blenlib/intern/BLI_args.c (+2, -1) (Diff)
/source/blender/blenlib/intern/bpath.c (+0, -3) (Diff)
/source/blender/blenlib/intern/math_geom.c (+2, -43) (Diff)
/source/blender/blenlib/intern/path_util.c (+1, -1) (Diff)
/source/blender/blenlib/intern/pbvh.c (+17, -43) (Diff)
/source/blender/blenloader/intern/readfile.c (+20, -4) (Diff)
/source/blender/blenloader/intern/writefile.c (+2, -2) (Diff)
/source/blender/collada/DocumentImporter.cpp (+1, -1) (Diff)
/source/blender/editors/animation/anim_ops.c (+1, -0) (Diff)
/source/blender/editors/armature/editarmature_sketch.c (+1, -0) (Diff)
/source/blender/editors/armature/poselib.c (+1, -1) (Diff)
/source/blender/editors/curve/editcurve.c (+2, -2) (Diff)
/source/blender/editors/curve/editfont.c (+2, -2) (Diff)
/source/blender/editors/gpencil/gpencil_buttons.c (+2, -2) (Diff)
/source/blender/editors/include/ED_keyframing.h (+1, -1) (Diff)
/source/blender/editors/include/ED_mesh.h (+0, -129) (Diff)
/source/blender/editors/include/UI_interface.h (+1, -1) (Diff)
/source/blender/editors/interface/interface_handlers.c (+10, -8) (Diff)
/source/blender/editors/interface/interface_layout.c (+20, -13) (Diff)
/source/blender/editors/interface/interface_ops.c (+2, -0) (Diff)
/source/blender/editors/interface/interface_regions.c (+13, -1) (Diff)
/source/blender/editors/interface/interface_widgets.c (+69, -8) (Diff)
/source/blender/editors/mesh/editmesh_add.c (+20, -0) (Diff)
/source/blender/editors/mesh/editmesh_mods.c (+1, -1) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+1, -1) (Diff)
/source/blender/editors/mesh/mesh_intern.h (+132, -7) (Diff)
/source/blender/editors/metaball/mball_edit.c (+6, -0) (Diff)
/source/blender/editors/object/object_add.c (+16, -0) (Diff)
/source/blender/editors/object/object_constraint.c (+2, -2) (Diff)
/source/blender/editors/object/object_edit.c (+7, -2) (Diff)
/source/blender/editors/object/object_modifier.c (+1, -1) (Diff)
/source/blender/editors/object/object_relations.c (+18, -17) (Diff)
/source/blender/editors/render/render_internal.c (+1, -1) (Diff)
/source/blender/editors/render/render_opengl.c (+9, -3) (Diff)
/source/blender/editors/render/render_preview.c (+1, -1) (Diff)
/source/blender/editors/render/render_shading.c (+1, -1) (Diff)
/source/blender/editors/screen/screendump.c (+1, -1) (Diff)
/source/blender/editors/screen/screen_context.c (+31, -1) (Diff)
/source/blender/editors/screen/screen_edit.c (+4, -3) (Diff)
/source/blender/editors/screen/screen_ops.c (+1, -0) (Diff)
/source/blender/editors/sculpt_paint/paint_ops.c (+0, -89) (Diff)
/source/blender/editors/sculpt_paint/paint_vertex.c (+1, -4) (Diff)
/source/blender/editors/sculpt_paint/sculpt.c (+0, -54) (Diff)
/source/blender/editors/sound/sound_ops.c (+1, -1) (Diff)
/source/blender/editors/space_action/action_edit.c (+1, -0) (Diff)
/source/blender/editors/space_file/filesel.c (+23, -13) (Diff)
/source/blender/editors/space_file/file_ops.c (+9, -1) (Diff)
/source/blender/editors/space_graph/graph_edit.c (+2, -1) (Diff)
/source/blender/editors/space_graph/graph_ops.c (+1, -0) (Diff)
/source/blender/editors/space_image/image_ops.c (+24, -10) (Diff)
/source/blender/editors/space_info/info_ops.c (+1, -1) (Diff)
/source/blender/editors/space_logic/logic_window.c (+20, -11) (Diff)
/source/blender/editors/space_node/node_edit.c (+15, -7) (Diff)
/source/blender/editors/space_outliner/outliner.c (+2, -2) (Diff)
/source/blender/editors/space_sequencer/sequencer_add.c (+96, -35) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+69, -30) (Diff)
/source/blender/editors/space_sequencer/sequencer_edit.c (+92, -183) (Diff)
/source/blender/editors/space_sequencer/sequencer_intern.h (+1, -2) (Diff)
/source/blender/editors/space_sequencer/sequencer_ops.c (+2, -0) (Diff)
/source/blender/editors/space_sequencer/sequencer_select.c (+4, -4) (Diff)
/source/blender/editors/space_sequencer/space_sequencer.c (+1, -0) (Diff)
/source/blender/editors/space_text/text_ops.c (+2, -2) (Diff)
/source/blender/editors/space_time/space_time.c (+14, -0) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+8, -8) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/drawvolume.c (+2, -2) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+3, -0) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_intern.h (+1, -0) (Diff)
/source/blender/editors/space_view3d/view3d_ops.c (+3, -1) (Diff)
/source/blender/editors/transform/transform.c (+23, -8) (Diff)
/source/blender/gpu/intern/gpu_buffers.c (+2, -2) (Diff)
/source/blender/imbuf/intern/cineon/cineonlib.c (+0, -2) (Diff)
/source/blender/imbuf/intern/thumbs_blend.c (+20, -13) (Diff)
/source/blender/makesdna/DNA_brush_types.h (+0, -8) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+6, -5) (Diff)
/source/blender/makesdna/DNA_sequence_types.h (+6, -0) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_constraint.c (+6, -1) (Diff)
/source/blender/makesrna/intern/rna_controller.c (+2, -0) (Diff)
/source/blender/makesrna/intern/rna_group.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_main_api.c (+36, -10) (Diff)
/source/blender/makesrna/intern/rna_object.c (+43, -4) (Diff)
/source/blender/makesrna/intern/rna_object_force.c (+18, -7) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_sequencer.c (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_ui_api.c (+11, -7) (Diff)
/source/blender/modifiers/intern/MOD_build.c (+2, -1) (Diff)
/source/blender/modifiers/intern/MOD_collision.c (+2, -1) (Diff)
/source/blender/modifiers/intern/MOD_explode.c (+3, -2) (Diff)
/source/blender/modifiers/intern/MOD_wave.c (+2, -1) (Diff)
/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c (+5, -4) (Diff)
/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c (+39, -19) (Diff)
/source/blender/python/doc/sphinx_doc_gen.py (+49, -12) (Diff)
/source/blender/python/doc/sphinx_doc_gen.sh (+1, -1) (Diff)
/source/blender/python/generic/bgl.c (+5, -5) (Diff)
/source/blender/python/generic/blf_api.c (+12, -12) (Diff)
/source/blender/python/generic/bpy_internal_import.c (+2, -7) (Diff)
/source/blender/python/generic/geometry.c (+1, -1) (Diff)
/source/blender/python/intern/bpy_driver.c (+0, -4) (Diff)
/source/blender/python/intern/bpy_interface.c (+2, -0) (Diff)
/source/blender/python/intern/bpy_props.c (+1, -1) (Diff)
/source/blender/render/intern/include/render_types.h (+2, -1) (Diff)
/source/blender/render/intern/source/convertblender.c (+27, -32) (Diff)
/source/blender/render/intern/source/pipeline.c (+15, -8) (Diff)
/source/blender/render/intern/source/pointdensity.c (+2, -1) (Diff)
/source/blender/render/intern/source/rayshade.c (+8, -4) (Diff)
/source/blender/render/intern/source/texture.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_event_system.c (+3, -3) (Diff)
/source/blender/windowmanager/intern/wm_files.c (+9, -3) (Diff)
/source/blender/windowmanager/intern/wm_keymap.c (+5, -2) (Diff)
/source/blender/windowmanager/intern/wm_operators.c (+21, -15) (Diff)
/source/blender/windowmanager/WM_api.h (+9, -0) (Diff)
/source/blender/windowmanager/WM_types.h (+1, -0) (Diff)
/tools/btools.py (+34, -17) (Diff)
/config/darwin-config.py (+7, -0) (Diff)
/config/linux2-config.py (+1, -1) (Diff)
/config/linuxcross-config.py (+1, -1) (Diff)
/config/win32-mingw-config.py (+2, -2) (Diff)
/config/win32-vc-config.py (+1, -1) (Diff)
/config/win64-vc-config.py (+1, -1) (Diff)
/doc/blender.1 (+218, -112) (Diff)
/source/blender/blenkernel/BKE_displist.h (+2, -1) (Diff)
/source/blender/blenkernel/BKE_image.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_lattice.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_mball.h (+3, -2) (Diff)
/source/blender/blenkernel/BKE_scene.h (+2, -0) (Diff)
/source/blender/blenkernel/BKE_sequencer.h (+8, -0) (Diff)
/source/blender/blenkernel/intern/action.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/anim.c (+5, -1) (Diff)
/source/blender/blenkernel/intern/blender.c (+5, -0) (Diff)
/source/blender/blenkernel/intern/cdderivedmesh.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/displist.c (+22, -9) (Diff)
/source/blender/blenkernel/intern/image.c (+6, -13) (Diff)
/source/blender/blenkernel/intern/lattice.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/mball.c (+18, -7) (Diff)
/source/blender/blenkernel/intern/node.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/object.c (+19, -30) (Diff)
/source/blender/blenkernel/intern/packedFile.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/particle.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/scene.c (+22, -17) (Diff)
/source/blender/blenkernel/intern/sequencer.c (+178, -12) (Diff)
/source/blender/blenkernel/intern/texture.c (+1, -0) (Diff)
/source/blender/blenlib/intern/BLI_args.c (+2, -1) (Diff)
/source/blender/blenlib/intern/bpath.c (+0, -3) (Diff)
/source/blender/blenlib/intern/math_geom.c (+2, -43) (Diff)
/source/blender/blenlib/intern/path_util.c (+1, -1) (Diff)
/source/blender/blenlib/intern/pbvh.c (+17, -43) (Diff)
/source/blender/blenloader/intern/readfile.c (+20, -4) (Diff)
/source/blender/blenloader/intern/writefile.c (+2, -2) (Diff)
/source/blender/collada/DocumentImporter.cpp (+1, -1) (Diff)
/source/blender/editors/animation/anim_ops.c (+1, -0) (Diff)
/source/blender/editors/armature/editarmature_sketch.c (+1, -0) (Diff)
/source/blender/editors/armature/poselib.c (+1, -1) (Diff)
/source/blender/editors/curve/editcurve.c (+2, -2) (Diff)
/source/blender/editors/curve/editfont.c (+2, -2) (Diff)
/source/blender/editors/gpencil/gpencil_buttons.c (+2, -2) (Diff)
/source/blender/editors/include/ED_keyframing.h (+1, -1) (Diff)
/source/blender/editors/include/ED_mesh.h (+0, -129) (Diff)
/source/blender/editors/include/UI_interface.h (+1, -1) (Diff)
/source/blender/editors/interface/interface_handlers.c (+10, -8) (Diff)
/source/blender/editors/interface/interface_layout.c (+20, -13) (Diff)
/source/blender/editors/interface/interface_ops.c (+2, -0) (Diff)
/source/blender/editors/interface/interface_regions.c (+13, -1) (Diff)
/source/blender/editors/interface/interface_widgets.c (+69, -8) (Diff)
/source/blender/editors/mesh/editmesh_add.c (+20, -0) (Diff)
/source/blender/editors/mesh/editmesh_mods.c (+1, -1) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+1, -1) (Diff)
/source/blender/editors/mesh/mesh_intern.h (+132, -7) (Diff)
/source/blender/editors/metaball/mball_edit.c (+6, -0) (Diff)
/source/blender/editors/object/object_add.c (+16, -0) (Diff)
/source/blender/editors/object/object_constraint.c (+2, -2) (Diff)
/source/blender/editors/object/object_edit.c (+7, -2) (Diff)
/source/blender/editors/object/object_modifier.c (+1, -1) (Diff)
/source/blender/editors/object/object_relations.c (+18, -17) (Diff)
/source/blender/editors/render/render_internal.c (+1, -1) (Diff)
/source/blender/editors/render/render_opengl.c (+9, -3) (Diff)
/source/blender/editors/render/render_preview.c (+1, -1) (Diff)
/source/blender/editors/render/render_shading.c (+1, -1) (Diff)
/source/blender/editors/screen/screendump.c (+1, -1) (Diff)
/source/blender/editors/screen/screen_context.c (+31, -1) (Diff)
/source/blender/editors/screen/screen_edit.c (+4, -3) (Diff)
/source/blender/editors/screen/screen_ops.c (+1, -0) (Diff)
/source/blender/editors/sculpt_paint/paint_ops.c (+0, -89) (Diff)
/source/blender/editors/sculpt_paint/paint_vertex.c (+1, -4) (Diff)
/source/blender/editors/sculpt_paint/sculpt.c (+0, -54) (Diff)
/source/blender/editors/sound/sound_ops.c (+1, -1) (Diff)
/source/blender/editors/space_action/action_edit.c (+1, -0) (Diff)
/source/blender/editors/space_file/filesel.c (+23, -13) (Diff)
/source/blender/editors/space_file/file_ops.c (+9, -1) (Diff)
/source/blender/editors/space_graph/graph_edit.c (+2, -1) (Diff)
/source/blender/editors/space_graph/graph_ops.c (+1, -0) (Diff)
/source/blender/editors/space_image/image_ops.c (+24, -10) (Diff)
/source/blender/editors/space_info/info_ops.c (+1, -1) (Diff)
/source/blender/editors/space_logic/logic_window.c (+20, -11) (Diff)
/source/blender/editors/space_node/node_edit.c (+15, -7) (Diff)
/source/blender/editors/space_outliner/outliner.c (+2, -2) (Diff)
/source/blender/editors/space_sequencer/sequencer_add.c (+96, -35) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+69, -30) (Diff)
/source/blender/editors/space_sequencer/sequencer_edit.c (+92, -183) (Diff)
/source/blender/editors/space_sequencer/sequencer_intern.h (+1, -2) (Diff)
/source/blender/editors/space_sequencer/sequencer_ops.c (+2, -0) (Diff)
/source/blender/editors/space_sequencer/sequencer_select.c (+4, -4) (Diff)
/source/blender/editors/space_sequencer/space_sequencer.c (+1, -0) (Diff)
/source/blender/editors/space_text/text_ops.c (+2, -2) (Diff)
/source/blender/editors/space_time/space_time.c (+14, -0) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+8, -8) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/drawvolume.c (+2, -2) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+3, -0) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_intern.h (+1, -0) (Diff)
/source/blender/editors/space_view3d/view3d_ops.c (+3, -1) (Diff)
/source/blender/editors/transform/transform.c (+23, -8) (Diff)
/source/blender/gpu/intern/gpu_buffers.c (+2, -2) (Diff)
/source/blender/imbuf/intern/cineon/cineonlib.c (+0, -2) (Diff)
/source/blender/imbuf/intern/thumbs_blend.c (+20, -13) (Diff)
/source/blender/makesdna/DNA_brush_types.h (+0, -8) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+6, -5) (Diff)
/source/blender/makesdna/DNA_sequence_types.h (+6, -0) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_constraint.c (+6, -1) (Diff)
/source/blender/makesrna/intern/rna_controller.c (+2, -0) (Diff)
/source/blender/makesrna/intern/rna_group.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_main_api.c (+36, -10) (Diff)
/source/blender/makesrna/intern/rna_object.c (+43, -4) (Diff)
/source/blender/makesrna/intern/rna_object_force.c (+18, -7) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_sequencer.c (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_ui_api.c (+11, -7) (Diff)
/source/blender/modifiers/intern/MOD_build.c (+2, -1) (Diff)
/source/blender/modifiers/intern/MOD_collision.c (+2, -1) (Diff)
/source/blender/modifiers/intern/MOD_explode.c (+3, -2) (Diff)
/source/blender/modifiers/intern/MOD_wave.c (+2, -1) (Diff)
/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c (+5, -4) (Diff)
/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c (+39, -19) (Diff)
/source/blender/python/doc/sphinx_doc_gen.py (+49, -12) (Diff)
/source/blender/python/doc/sphinx_doc_gen.sh (+1, -1) (Diff)
/source/blender/python/generic/bgl.c (+5, -5) (Diff)
/source/blender/python/generic/blf_api.c (+12, -12) (Diff)
/source/blender/python/generic/bpy_internal_import.c (+2, -7) (Diff)
/source/blender/python/generic/geometry.c (+1, -1) (Diff)
/source/blender/python/intern/bpy_driver.c (+0, -4) (Diff)
/source/blender/python/intern/bpy_interface.c (+2, -0) (Diff)
/source/blender/python/intern/bpy_props.c (+1, -1) (Diff)
/source/blender/render/intern/include/render_types.h (+2, -1) (Diff)
/source/blender/render/intern/source/convertblender.c (+27, -32) (Diff)
/source/blender/render/intern/source/pipeline.c (+15, -8) (Diff)
/source/blender/render/intern/source/pointdensity.c (+2, -1) (Diff)
/source/blender/render/intern/source/rayshade.c (+8, -4) (Diff)
/source/blender/render/intern/source/texture.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_event_system.c (+3, -3) (Diff)
/source/blender/windowmanager/intern/wm_files.c (+9, -3) (Diff)
/source/blender/windowmanager/intern/wm_keymap.c (+5, -2) (Diff)
/source/blender/windowmanager/intern/wm_operators.c (+21, -15) (Diff)
/source/blender/windowmanager/WM_api.h (+9, -0) (Diff)
/source/blender/windowmanager/WM_types.h (+1, -0) (Diff)
/tools/btools.py (+34, -17) (Diff)