accident when merge. revert to r37405
authorXiao Xiangquan <xiaoxiangquan@gmail.com>
Sat, 11 Jun 2011 18:15:46 +0000 (18:15 +0000)
committerXiao Xiangquan <xiaoxiangquan@gmail.com>
Sat, 11 Jun 2011 18:15:46 +0000 (18:15 +0000)
commit12f0795d498d4143af5a3203efad07589312300d
tree1638bd9c509270db9f1e4d54aac469fbb35d5e69
parent2d3795ab3c5b107702012b21354174da2ca00e33
parent81946b9138201800e495eb28addf254958feb1a4
accident when merge. revert to r37405
37 files changed:
build_files/cmake/FindPythonLibsUnix.cmake
build_files/cmake/macros.cmake
release/scripts/modules/console/complete_namespace.py
release/scripts/modules/console_python.py
release/scripts/startup/bl_ui/properties_data_mesh.py
release/scripts/startup/bl_ui/properties_data_metaball.py
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/scene.c
source/blender/editors/include/ED_particle.h
source/blender/editors/interface/interface_intern.h
source/blender/editors/object/object_add.c
source/blender/editors/object/object_shapekey.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/render/render_view.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_intern.h
source/blender/editors/sculpt_paint/paint_stroke.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_image/image_buttons.c
source/blender/editors/space_node/node_edit.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/uvedit/uvedit_parametrizer.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/envmap.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/pixelshading.c
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt
source/creator/creator.c