Blender Git Loki
Git Commits -> Revision a09cdc7
Revision a09cdc7 by Jason Wilkins (soc-2010-jwilkins) May 28, 2010, 02:25 (GMT) |
merged with head |
Commit Details:
Full Hash: a09cdc7805dde4ab52fc71f0cba8cd705ad3deaa
SVN Revision: 29039
Parent Commit: bf1a1b6
Lines Changed: +7712, -7035
68 Modified Paths:
/CMakeLists.txt (+2, -2) (Diff)
/release/datafiles/blenderbuttons (+0, -0) (Diff)
/release/scripts/modules/bpy_types.py (+14, -6) (Diff)
/release/scripts/ui/properties_object.py (+1, -1) (Diff)
/release/scripts/ui/properties_object_constraint.py (+17, -1) (Diff)
/release/scripts/ui/space_userpref.py (+4, -0) (Diff)
/release/scripts/ui/space_view3d.py (+2, -0) (Diff)
/SConstruct (+2, -2) (Diff)
/source/blender/blenkernel/intern/anim.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/cloth.c (+2, -5) (Diff)
/source/blender/blenkernel/intern/collision.c (+15, -17) (Diff)
/source/blender/blenkernel/intern/constraint.c (+166, -53) (Diff)
/source/blender/blenkernel/intern/customdata.c (+6, -4) (Diff)
/source/blender/blenkernel/intern/image.c (+29, -20) (Diff)
/source/blender/blenkernel/intern/implicit.c (+34, -31) (Diff)
/source/blender/blenkernel/intern/node.c (+6, -6) (Diff)
/source/blender/blenkernel/intern/object.c (+19, -9) (Diff)
/source/blender/blenkernel/intern/sca.c (+22, -1) (Diff)
/source/blender/blenlib/intern/threads.c (+1, -4) (Diff)
/source/blender/blenloader/intern/readfile.c (+39, -3) (Diff)
/source/blender/editors/datafiles/blenderbuttons.c (+6539, -6538) (Diff)
/source/blender/editors/include/UI_interface.h (+4, -2) (Diff)
/source/blender/editors/interface/interface.c (+1, -1) (Diff)
/source/blender/editors/interface/interface_handlers.c (+10, -4) (Diff)
/source/blender/editors/interface/interface_intern.h (+2, -1) (Diff)
/source/blender/editors/interface/interface_templates.c (+26, -10) (Diff)
/source/blender/editors/interface/interface_widgets.c (+59, -2) (Diff)
/source/blender/editors/interface/resources.c (+22, -0) (Diff)
/source/blender/editors/object/object_bake.c (+7, -5) (Diff)
/source/blender/editors/object/object_constraint.c (+116, -53) (Diff)
/source/blender/editors/object/object_intern.h (+3, -1) (Diff)
/source/blender/editors/object/object_ops.c (+2, -1) (Diff)
/source/blender/editors/object/object_select.c (+2, -0) (Diff)
/source/blender/editors/physics/physics_fluid.c (+62, -49) (Diff)
/source/blender/editors/render/render_internal.c (+13, -2) (Diff)
/source/blender/editors/render/render_preview.c (+3, -3) (Diff)
/source/blender/editors/screen/screendump.c (+2, -2) (Diff)
/source/blender/editors/space_file/filelist.c (+2, -2) (Diff)
/source/blender/editors/space_info/space_info.c (+4, -0) (Diff)
/source/blender/editors/space_node/node_edit.c (+14, -2) (Diff)
/source/blender/makesdna/DNA_constraint_types.h (+50, -6) (Diff)
/source/blender/makesdna/DNA_node_types.h (+2, -2) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_actuator.c (+23, -0) (Diff)
/source/blender/makesrna/intern/rna_constraint.c (+60, -0) (Diff)
/source/blender/makesrna/intern/rna_fcurve.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_sensor.c (+13, -3) (Diff)
/source/blender/makesrna/intern/rna_userdef.c (+7, -0) (Diff)
/source/blender/makesrna/intern/SConscript (+3, -0) (Diff)
/source/blender/makesrna/RNA_access.h (+1, -0) (Diff)
/source/blender/modifiers/intern/MOD_meshdeform.c (+15, -3) (Diff)
/source/blender/nodes/intern/CMP_nodes/CMP_displace.c (+62, -73) (Diff)
/source/blender/render/extern/include/RE_pipeline.h (+1, -1) (Diff)
/source/blender/render/extern/include/RE_shader_ext.h (+1, -1) (Diff)
/source/blender/render/intern/include/render_types.h (+2, -2) (Diff)
/source/blender/render/intern/source/imagetexture.c (+60, -50) (Diff)
/source/blender/render/intern/source/pipeline.c (+12, -7) (Diff)
/source/blender/render/intern/source/rendercore.c (+11, -7) (Diff)
/source/blender/windowmanager/intern/wm_files.c (+12, -6) (Diff)
/source/blender/windowmanager/intern/wm_jobs.c (+56, -9) (Diff)
/source/blender/windowmanager/WM_api.h (+5, -2) (Diff)
/source/blender/windowmanager/WM_types.h (+1, -0) (Diff)
/source/creator/creator.c (+14, -11) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+3, -3) (Diff)
/source/gameengine/Converter/BL_ModifierDeformer.cpp (+16, -0) (Diff)
/source/gameengine/Converter/BL_ModifierDeformer.h (+1, -0) (Diff)
/source/gameengine/Ketsji/KX_Scene.cpp (+2, -2) (Diff)
/source/nan_definitions.mk (+1, -1) (Diff)
/release/datafiles/blenderbuttons (+0, -0) (Diff)
/release/scripts/modules/bpy_types.py (+14, -6) (Diff)
/release/scripts/ui/properties_object.py (+1, -1) (Diff)
/release/scripts/ui/properties_object_constraint.py (+17, -1) (Diff)
/release/scripts/ui/space_userpref.py (+4, -0) (Diff)
/release/scripts/ui/space_view3d.py (+2, -0) (Diff)
/SConstruct (+2, -2) (Diff)
/source/blender/blenkernel/intern/anim.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/cloth.c (+2, -5) (Diff)
/source/blender/blenkernel/intern/collision.c (+15, -17) (Diff)
/source/blender/blenkernel/intern/constraint.c (+166, -53) (Diff)
/source/blender/blenkernel/intern/customdata.c (+6, -4) (Diff)
/source/blender/blenkernel/intern/image.c (+29, -20) (Diff)
/source/blender/blenkernel/intern/implicit.c (+34, -31) (Diff)
/source/blender/blenkernel/intern/node.c (+6, -6) (Diff)
/source/blender/blenkernel/intern/object.c (+19, -9) (Diff)
/source/blender/blenkernel/intern/sca.c (+22, -1) (Diff)
/source/blender/blenlib/intern/threads.c (+1, -4) (Diff)
/source/blender/blenloader/intern/readfile.c (+39, -3) (Diff)
/source/blender/editors/datafiles/blenderbuttons.c (+6539, -6538) (Diff)
/source/blender/editors/include/UI_interface.h (+4, -2) (Diff)
/source/blender/editors/interface/interface.c (+1, -1) (Diff)
/source/blender/editors/interface/interface_handlers.c (+10, -4) (Diff)
/source/blender/editors/interface/interface_intern.h (+2, -1) (Diff)
/source/blender/editors/interface/interface_templates.c (+26, -10) (Diff)
/source/blender/editors/interface/interface_widgets.c (+59, -2) (Diff)
/source/blender/editors/interface/resources.c (+22, -0) (Diff)
/source/blender/editors/object/object_bake.c (+7, -5) (Diff)
/source/blender/editors/object/object_constraint.c (+116, -53) (Diff)
/source/blender/editors/object/object_intern.h (+3, -1) (Diff)
/source/blender/editors/object/object_ops.c (+2, -1) (Diff)
/source/blender/editors/object/object_select.c (+2, -0) (Diff)
/source/blender/editors/physics/physics_fluid.c (+62, -49) (Diff)
/source/blender/editors/render/render_internal.c (+13, -2) (Diff)
/source/blender/editors/render/render_preview.c (+3, -3) (Diff)
/source/blender/editors/screen/screendump.c (+2, -2) (Diff)
/source/blender/editors/space_file/filelist.c (+2, -2) (Diff)
/source/blender/editors/space_info/space_info.c (+4, -0) (Diff)
/source/blender/editors/space_node/node_edit.c (+14, -2) (Diff)
/source/blender/makesdna/DNA_constraint_types.h (+50, -6) (Diff)
/source/blender/makesdna/DNA_node_types.h (+2, -2) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_actuator.c (+23, -0) (Diff)
/source/blender/makesrna/intern/rna_constraint.c (+60, -0) (Diff)
/source/blender/makesrna/intern/rna_fcurve.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_sensor.c (+13, -3) (Diff)
/source/blender/makesrna/intern/rna_userdef.c (+7, -0) (Diff)
/source/blender/makesrna/intern/SConscript (+3, -0) (Diff)
/source/blender/makesrna/RNA_access.h (+1, -0) (Diff)
/source/blender/modifiers/intern/MOD_meshdeform.c (+15, -3) (Diff)
/source/blender/nodes/intern/CMP_nodes/CMP_displace.c (+62, -73) (Diff)
/source/blender/render/extern/include/RE_pipeline.h (+1, -1) (Diff)
/source/blender/render/extern/include/RE_shader_ext.h (+1, -1) (Diff)
/source/blender/render/intern/include/render_types.h (+2, -2) (Diff)
/source/blender/render/intern/source/imagetexture.c (+60, -50) (Diff)
/source/blender/render/intern/source/pipeline.c (+12, -7) (Diff)
/source/blender/render/intern/source/rendercore.c (+11, -7) (Diff)
/source/blender/windowmanager/intern/wm_files.c (+12, -6) (Diff)
/source/blender/windowmanager/intern/wm_jobs.c (+56, -9) (Diff)
/source/blender/windowmanager/WM_api.h (+5, -2) (Diff)
/source/blender/windowmanager/WM_types.h (+1, -0) (Diff)
/source/creator/creator.c (+14, -11) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+3, -3) (Diff)
/source/gameengine/Converter/BL_ModifierDeformer.cpp (+16, -0) (Diff)
/source/gameengine/Converter/BL_ModifierDeformer.h (+1, -0) (Diff)
/source/gameengine/Ketsji/KX_Scene.cpp (+2, -2) (Diff)
/source/nan_definitions.mk (+1, -1) (Diff)