svn merge -r 22371:22571 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Mon, 17 Aug 2009 17:43:49 +0000 (17:43 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Mon, 17 Aug 2009 17:43:49 +0000 (17:43 +0000)
1  2 
release/ui/buttons_scene.py
source/blender/blenkernel/BKE_utildefines.h
source/blender/blenlib/intern/BLI_kdopbvh.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/render/extern/include/RE_shader_ext.h
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/rayshade.c
source/blender/render/intern/source/rendercore.c
source/blender/render/intern/source/shadeinput.c
source/blender/windowmanager/intern/wm_init_exit.c

Simple merge
index 980ff59b86a67603f6afbfe91356d192159692dd,5f5b493a9ecef60c83c7a1857c8863514c94c48e..9a340e625f3e8da78b90a98b480f0d652c073611
@@@ -56,9 -55,7 +56,8 @@@ typedef struct ShadeResul
        float refl[3];
        float refr[3];
        float nor[3];
-       float rad[3];
        float winspeed[4];
 +      float rayhits[4];
  } ShadeResult;
  
  /* only here for quick copy */
index 071c70ae504ade5e45366d5e50556248717268b8,0c8749ce3292c1d6697a6a6997f65dc1035683a1..05c961d49deaba86d249453042623b7d2cedb292
@@@ -1402,8 -1183,9 +1402,8 @@@ void ray_trace(ShadeInput *shi, ShadeRe
        float diff[3];
        int do_tra, do_mir;
        
-       do_tra= ((shi->mat->mode & (MA_RAYTRANSP)) && shr->alpha!=1.0f);
+       do_tra= ((shi->mat->mode & MA_TRANSP) && (shi->mat->mode & MA_RAYTRANSP) && shr->alpha!=1.0f);
        do_mir= ((shi->mat->mode & MA_RAYMIRROR) && shi->ray_mirror!=0.0f);
 -
        
        /* raytrace mirror amd refract like to separate the spec color */
        if(shi->combinedflag & SCE_PASS_SPEC)
index aaa38cee7d8e300382fb1ccfb2ec5f6684b1102e,ee826d5f57eed78f618f1ca044b77e4af6b67c48..46786b159c07206593f311cd269bf2ce464ebd2a
@@@ -208,18 -206,9 +206,12 @@@ void WM_exit(bContext *C
        
        BKE_freecubetable();
        
-       /* before free_blender so py's gc happens while library still exists */
-       /* needed at least for a rare sigsegv that can happen in pydrivers */
- #ifndef DISABLE_PYTHON
-       BPY_end_python();
- #endif
-       
        fastshade_free_render();        /* shaded view */
        ED_preview_free_dbase();        /* frees a Main dbase, before free_blender! */
 -      wm_free_reports(C);                     /* before free_blender! - since the ListBases get freed there */
 +
 +      if(C && CTX_wm_manager(C))
 +              wm_free_reports(C);                     /* before free_blender! - since the ListBases get freed there */
 +              
        free_blender();                         /* blender.c, does entire library and spacetypes */
  //    free_matcopybuf();
        free_anim_copybuf();