Merged changes in the trunk up to revision 35505.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 13 Mar 2011 02:10:39 +0000 (02:10 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 13 Mar 2011 02:10:39 +0000 (02:10 +0000)
Conflicts resolved:
source/blender/makesdna/DNA_material_types.h

14 files changed:
1  2 
release/scripts/ui/properties_render.py
release/scripts/ui/space_dopesheet.py
release/scripts/ui/space_userpref.py
source/blender/blenkernel/intern/idcode.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_material_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/CMakeLists.txt
source/blender/python/intern/bpy.c
source/blender/render/intern/source/shadeinput.c
source/blender/render/intern/source/shadeoutput.c
source/creator/CMakeLists.txt

index 974eef48fcf5b233bb6fa26f42a743b4d4402ad5,c5e56a61a8ccf696146e436aac153228e0004224..d09755a3f3ce0e007c5ab9dc3a66e1b17a14ba9e
@@@ -905,19 -610,19 +902,19 @@@ class RENDER_PT_bake(RenderButtonsPanel
          rd = context.scene.render
  
          layout.operator("object.bake_image", icon='RENDER_STILL')
 -
 +        
          layout.prop(rd, "bake_type")
 -
 +        
          if rd.bake_type == 'NORMALS':
              layout.prop(rd, "bake_normal_space")
-         elif rd.bake_type in ('DISPLACEMENT', 'AO'):
+         elif rd.bake_type in {'DISPLACEMENT', 'AO'}:
              layout.prop(rd, "use_bake_normalize")
 -
 +        
          # col.prop(rd, "bake_aa_mode")
          # col.prop(rd, "use_bake_antialiasing")
 -
 +        
          layout.separator()
 -
 +        
          split = layout.split()
  
          col = split.column()
Simple merge
Simple merge
index 9d97b6af8f3b483cbc0a47428b80855eb5fd5588,1489593f7f624cfbe53d69c9ddcf1b9a8c7117b8..b8540fabd5b622ebf9906f4270e30161eedf6cdc
@@@ -160,7 -160,8 +160,9 @@@ typedef struct Material 
        short sss_flag, sss_preset;
  
        int mapto_textured;     /* render-time cache to optimise texture lookups */
-       short vcol_alpha, pad4;
+       short shadowonly_flag;          /* "shadowsonly" type */
 -      short pad;
++
++      short vcol_alpha;
  
        ListBase gpumaterial;           /* runtime */
  } Material;
Simple merge
index a8d790d9d7847c8e56cd191717e94b230c4be464,768f1425c6ff60e7c8c96629f88416ca15b941f4..c4634b261af7ff6e6ae802e4c0598da0a755c684
@@@ -1598,11 -1657,13 +1657,13 @@@ void shade_lamp_loop(ShadeInput *shi, S
                        shi->r= shi->vcol[0];
                        shi->g= shi->vcol[1];
                        shi->b= shi->vcol[2];
 -                      if(ma->mode & (MA_FACETEXTURE_ALPHA))
 +                      if((ma->mode & (MA_FACETEXTURE_ALPHA)) || ma->vcol_alpha)
-                               shi->alpha= shi->vcol[3];
+                               shi->alpha= (shi->mode & MA_TRANSP) ? shi->vcol[3] : 1.0f;
                }
-               if(ma->texco)
+               if(ma->texco){
                        do_material_tex(shi);
+                       if (!(shi->mode & MA_TRANSP)) shi->alpha = 1.0f;
+               }
                
                shr->col[0]= shi->r*shi->alpha;
                shr->col[1]= shi->g*shi->alpha;
index 83ee6a4cb882c97010b47107212599466f793445,5572977f157736efaa41a731a8f4912a4353a0cd..49712a70799a8cdb8b644360dd13d0a6dcb9951f
@@@ -563,11 -635,10 +636,11 @@@ endif(
                bf_editor_animation
                bf_editor_datafiles
  
-               bf_render 
-               bf_intern_opennl 
-               bf_python 
-               bf_python_ext 
+               bf_render
+               bf_intern_opennl
+               bf_python
+               bf_python_ext
 +              bf_freestyle
                bf_ikplugin
                bf_modifiers
                bf_blenkernel