Saturday merger of bf-blender in orange branch.
authorTon Roosendaal <ton@blender.org>
Sat, 17 Dec 2005 20:25:41 +0000 (20:25 +0000)
committerTon Roosendaal <ton@blender.org>
Sat, 17 Dec 2005 20:25:41 +0000 (20:25 +0000)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/include/blendef.h
source/blender/makesdna/DNA_material_types.h
source/blender/src/buttons_shading.c
source/blender/src/header_oops.c
source/blender/src/outliner.c
source/blender/src/space.c
source/blender/src/toets.c

Simple merge
index 8e150b10a823912dd00c1501c878a5d76729d857,451b8ba692f96bea10b0daa13f50cad3bf427218..79d73ff2b996cfdbb3587e11f10f119a0c6975f6
@@@ -169,9 -156,9 +169,11 @@@ typedef struct Material 
  #define MA_FULL_OSA           0x800000
  #define MA_TANGENT_STR        0x1000000
  #define MA_SHADBUF            0x2000000
 +              /* note; we drop MA_TANGENT_STR later to become tangent_u */
 +#define MA_TANGENT_V  0x4000000
  
+ #define       MA_MODE_MASK    0x3ffffff       /* all valid mode bits */
  /* diff_shader */
  #define MA_DIFF_LAMBERT               0
  #define MA_DIFF_ORENNAYAR     1
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge