Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merged changes in the trunk up to revision 54992.

Browse Source 
Resolved conflicts:
release/scripts/startup/bl_ui/space_view3d.py
This commit is contained in:
Tamito Kajiyama
2013-03-03 15:07:49 +00:00
parent 0c5dfc8a63 4774357b59
commit 66a2b84897
516 changed files with 26540 additions and 23570 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/creator/CMakeLists.txt
View File

@@ -844,12 +844,12 @@ endif()
bf_editor_util
bf_editor_uvedit
bf_editor_curve
bf_editor_armature
bf_editor_gpencil
bf_editor_interface
bf_editor_mesh
bf_editor_metaball
bf_editor_object
bf_editor_armature
bf_editor_physics
bf_editor_render
bf_editor_screen
@@ -899,7 +899,6 @@ endif()
extern_colamd
ge_logic_ketsji
extern_recastnavigation
ge_phys_common
ge_logic
ge_rasterizer
ge_oglrasterizer