Merging r39634 through r39716 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 26 Aug 2011 20:12:54 +0000 (20:12 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 26 Aug 2011 20:12:54 +0000 (20:12 +0000)
17 files changed:
1  2 
CMakeLists.txt
build_files/scons/config/darwin-config.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface_draw.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/DNA_view3d_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/windowmanager/intern/wm_operators.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp

diff --cc CMakeLists.txt
Simple merge
@@@ -257,9 -247,7 +257,10 @@@ typedef struct View3D 
  #define V3D_SOLID_TEX                 8
  #define V3D_DISPGP                            16
  #define V3D_LOCK_CAMERA                       32
- #define V3D_SHOW_RECONSTRUCTION       64
- #define V3D_SHOW_CAMERAPATH           128
- #define V3D_SHOW_BUNDLENAME           256
+ #define V3D_RENDER_SHADOW             64 /* This is a runtime only flag that's used to tell draw_mesh_object() that we're doing a shadow pass instead of a regular draw */
++#define V3D_SHOW_RECONSTRUCTION               128
++#define V3D_SHOW_CAMERAPATH           256
++#define V3D_SHOW_BUNDLENAME           512
  
  /* View3D->around */
  #define V3D_CENTER             0