bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity
31258507d0
blender/release/scripts/ui
History
Arystanbek Dyussenov 31258507d0 Merge of the COLLADA GSoC branch into trunk. 
COLLADA code is disabled by default (it has dependencies requiring manual install).

SCons and CMake builds are supported on Windows and Linux, no Mac building yet. More on building COLLADA code: http://wiki.blender.org/index.php/User:Kazanbas/Building_Collada_Branch.

The detailed command log of the merge (can be useful for educational purposes):

branch=https://svn.blender.org/svnroot/bf-blender/branches/soc-2009-chingachgook
# collada code
svn copy $branch/source/blender/collada source/blender/collada
# operator
svn merge -c 20401,20955,21077,24077,24079 $branch/source/blender/windowmanager/intern/wm_operators.c source/blender/windowmanager/intern/wm_operators.c
# menu
svn merge -c 24079 $branch/release/scripts/ui/space_info.py release/scripts/ui/space_info.py
# scons
svn merge -c 20398 $branch/source/blender/SConscript source/blender/SConscript
svn merge -c 20398,20691,20955,22726 $branch/tools/btools.py tools/btools.py
svn merge -c 20691,20955,22726 $branch/tools/Blender.py tools/Blender.py
svn merge -c 20398,20692,20955 $branch/config/linux2-config.py config/linux2-config.py
svn merge -c 22726 $branch/config/win64-vc-config.py config/win64-vc-config.py
svn merge -c 22726 $branch/config/win32-vc-config.py config/win32-vc-config.py
svn merge -c 24077 $branch/source/blender/windowmanager/SConscript source/blender/windowmanager/SConscript
# cmake
svn merge -c 23319,23905,24077,24158 $branch/CMakeLists.txt CMakeLists.txt
svn merge -c 23319 $branch/source/blender/CMakeLists.txt source/blender/CMakeLists.txt
svn merge -c 23319 $branch/source/creator/CMakeLists.txt source/creator/CMakeLists.txt
svn merge -c 23319 $branch/CMake/macros.cmake CMake/macros.cmake
svn merge -c 24077 $branch/source/blender/windowmanager/CMakeLists.txt source/blender/windowmanager/CMakeLists.txt
2009-10-30 15:35:50 +00:00
..
buttons_data_armature.py Moved some tool settings (mirror, auto-IK) to the tools pane. 2009-10-19 13:24:18 +00:00
buttons_data_bone.py * Some Whitespace and small code-guideline cleanup. 2009-10-29 23:46:12 +00:00
buttons_data_camera.py - removed 2.4x release/scripts 2009-09-28 03:19:52 +00:00
buttons_data_curve.py * Some Whitespace and small code-guideline cleanup. 2009-10-29 23:46:12 +00:00
buttons_data_empty.py Added a button in the header to toggle full screen mode. It'd be nice to have this right-aligned, but this doesn't seem possible in the layout engine currently. 2009-10-20 13:56:53 +00:00
buttons_data_lamp.py Deep Shadow Buffer 2009-10-12 19:41:40 +00:00
buttons_data_lattice.py - removed 2.4x release/scripts 2009-09-28 03:19:52 +00:00
buttons_data_mesh.py Shape Keys 2009-10-22 17:12:28 +00:00
buttons_data_metaball.py - removed 2.4x release/scripts 2009-09-28 03:19:52 +00:00
buttons_data_modifier.py - removed 2.4x release/scripts 2009-09-28 03:19:52 +00:00
buttons_data_text.py - removed 2.4x release/scripts 2009-09-28 03:19:52 +00:00
buttons_game.py Forgot to commit these files in 23837. 2009-10-16 19:25:51 +00:00
buttons_material.py * Some Whitespace and small code-guideline cleanup. 2009-10-29 23:46:12 +00:00
buttons_object_constraint.py New Track To Constraint: "Damped" 2009-10-30 06:33:40 +00:00
buttons_object.py * Added greying out for Bound Box Menu. 2009-10-29 21:31:00 +00:00
buttons_particle.py * Some Whitespace and small code-guideline cleanup. 2009-10-29 23:46:12 +00:00
buttons_physics_cloth.py * Added missing "Passes" Button for AAO, reported by nudelZ. 2009-10-28 23:47:56 +00:00
buttons_physics_common.py * Tiny Force Field Layout improvements and tooltip fix by nudelZ. Thanks! 2009-10-29 22:08:09 +00:00
buttons_physics_field.py * Some Whitespace and small code-guideline cleanup. 2009-10-29 23:46:12 +00:00
buttons_physics_fluid.py - removed 2.4x release/scripts 2009-09-28 03:19:52 +00:00
buttons_physics_smoke.py * Show Smoke Field Weights only for Domains. 2009-10-09 13:56:35 +00:00
buttons_physics_softbody.py Unified effector functionality for particles, cloth and softbody 2009-09-30 22:10:14 +00:00
buttons_render.py stamp font size and added rendertime stamp option 2009-10-15 19:18:40 +00:00
buttons_scene.py UI Templates: RNA-Path Builder (Skeleton Code) 2009-10-15 10:13:59 +00:00
buttons_texture.py Fixed [#19735] No normal map button in texture->image pane 2009-10-29 14:27:56 +00:00
buttons_world.py * Added missing "Passes" Button for AAO, reported by nudelZ. 2009-10-28 23:47:56 +00:00
space_buttons.py menus are now global (like operators), so for eg, the info add menu and the 3D add menu can be shared. 2009-10-08 19:06:32 +00:00
space_console.py replacement for my own autocomplete module by stani 2009-10-29 20:55:45 +00:00
space_filebrowser.py * Some Whitespace and small code-guideline cleanup. 2009-10-29 23:46:12 +00:00
space_image.py minor changes to texture ui, not user visible 2009-10-12 14:38:35 +00:00
space_info.py Merge of the COLLADA GSoC branch into trunk. 2009-10-30 15:35:50 +00:00
space_logic.py - removed 2.4x release/scripts 2009-09-28 03:19:52 +00:00
space_node.py menus are now global (like operators), so for eg, the info add menu and the 3D add menu can be shared. 2009-10-08 19:06:32 +00:00
space_outliner.py Outliner: Tweaks for Driver Operators 2009-10-21 05:59:51 +00:00
space_sequencer.py * Some Whitespace and small code-guideline cleanup. 2009-10-29 23:46:12 +00:00
space_text.py Script templates, including game logic scripts from 2.4x and new operator template. 2009-10-29 11:26:44 +00:00
space_time.py menus are now global (like operators), so for eg, the info add menu and the 3D add menu can be shared. 2009-10-08 19:06:32 +00:00
space_userpref.py * Some Whitespace and small code-guideline cleanup. 2009-10-29 23:46:12 +00:00
space_view3d_toolbar.py added an 'auto-normalize' option for weight paint mode, that automatically ensures vertex groups that affect bones all add up to 1.0. please test and give feedback. 2009-10-30 02:09:52 +00:00
space_view3d.py * Some Whitespace and small code-guideline cleanup. 2009-10-29 23:46:12 +00:00