svn merge -r 22628:22714 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
authorMatt Ebb <matt@mke3.net>
Sun, 23 Aug 2009 03:33:33 +0000 (03:33 +0000)
committerMatt Ebb <matt@mke3.net>
Sun, 23 Aug 2009 03:33:33 +0000 (03:33 +0000)
1  2 
release/ui/buttons_material.py
release/ui/buttons_texture.py
source/blender/blenkernel/intern/material.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/preview/previewrender.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_texture.c
source/blender/render/intern/source/texture.c

@@@ -679,11 -587,8 +718,12 @@@ bpy.types.register(MATERIAL_PT_shading
  bpy.types.register(MATERIAL_PT_transp)
  bpy.types.register(MATERIAL_PT_mirror)
  bpy.types.register(MATERIAL_PT_sss)
 +bpy.types.register(MATERIAL_PT_volume_shading)
 +bpy.types.register(MATERIAL_PT_volume_scattering)
 +bpy.types.register(MATERIAL_PT_volume_transp)
 +bpy.types.register(MATERIAL_PT_volume_integration)
  bpy.types.register(MATERIAL_PT_halo)
+ bpy.types.register(MATERIAL_PT_flare)
  bpy.types.register(MATERIAL_PT_physics)
  bpy.types.register(MATERIAL_PT_strand)
  bpy.types.register(MATERIAL_PT_options)
Simple merge
@@@ -170,22 -170,7 +170,22 @@@ void init_material(Material *ma
        ma->sss_front= 1.0f;
        ma->sss_back= 1.0f;
  
-       ma->mode= MA_TRACEBLE|MA_SHADBUF|MA_SHADOW|MA_RAYBIAS|MA_TANGENT_STR;
 +      ma->vol.density = 1.0f;
 +      ma->vol.emission = 0.0f;
 +      ma->vol.absorption = 1.0f;
 +      ma->vol.scattering = 1.0f;
 +      ma->vol.emission_col[0] = ma->vol.emission_col[1] = ma->vol.emission_col[2] = 1.0f;
 +      ma->vol.absorption_col[0] = ma->vol.absorption_col[1] = ma->vol.absorption_col[2] = 0.0f;
 +      ma->vol.density_scale = 1.0f;
 +      ma->vol.depth_cutoff = 0.01f;
 +      ma->vol.stepsize_type = MA_VOL_STEP_RANDOMIZED;
 +      ma->vol.stepsize = 0.2f;
 +      ma->vol.shade_stepsize = 0.2f;
 +      ma->vol.shade_type = MA_VOL_SHADE_SINGLE;
 +      ma->vol.shadeflag |= MA_VOL_PRECACHESHADING;
 +      ma->vol.precache_resolution = 50;
 +      
+       ma->mode= MA_TRACEBLE|MA_SHADBUF|MA_SHADOW|MA_RAYBIAS|MA_TANGENT_STR|MA_ZTRANSP;
  
        ma->preview = NULL;
  }
Simple merge