diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-11-29 01:21:12 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-11-29 01:21:12 +0300 |
| commit | 561319989e6a80fda82bd70f7f9a3c0651536d98 (patch) | |
| tree | 5b28dd152615e699277c69df36ba0aae7f394eb0 /source/blender/src/buttons_shading.c | |
| parent | 91dc459bccaa0ea89cf8a65cbb46729763ff6156 (diff) | |
Render Baking
=============
A new "Selected to Active" option in the Bake panel, to (typically) bake
a high poly object onto a low poly object. Code based on patch #7339 by
Frank Richter (Crystal Space developer), thanks!.
Normal Mapping
==============
Camera, World, Object and Tangent space is now supported for baking, and
for material textures. The "NMap TS" setting is replaced with a dropdown
of the four choices in the image texture buttons.
http://www.blender.org/development/current-projects/changes-since-244/render-baking/
Diffstat (limited to 'source/blender/src/buttons_shading.c')
| -rw-r--r-- | source/blender/src/buttons_shading.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c index 03fce824f7f..f21272f53da 100644 --- a/source/blender/src/buttons_shading.c +++ b/source/blender/src/buttons_shading.c @@ -1227,7 +1227,7 @@ static void texture_panel_image(Image **ima, ImageUser *iuser) uiblock_image_panel(block, ima, iuser, B_REDR, B_IMAGECHANGED); } -static void texture_panel_image_map(Tex *tex) +static void texture_panel_image_map(Tex *tex, MTex *mtex) { uiBlock *block; @@ -1249,8 +1249,13 @@ static void texture_panel_image_map(Tex *tex) uiDefButF(block, NUM, B_TEXPRV, "Filter :", 10,120,150,20, &tex->filtersize, 0.1, 25.0, 10, 3, "Sets the filter size used by mipmap and interpol"); - uiDefButBitS(block, TOG, TEX_NORMALMAP, B_NOP, "Normal Map", 160,120,150,20, &tex->imaflag, + uiBlockBeginAlign(block); + uiDefButBitS(block, TOG, TEX_NORMALMAP, B_NOP, "Normal Map", 160,120,(mtex)? 75: 150,20, &tex->imaflag, 0, 0, 0, 0, "Use image RGB values for normal mapping"); + if(mtex) + uiDefButS(block, MENU, B_DIFF, "Normal Space %t|Camera %x0|World %x1|Object %x2|Tangent %x3", + 235,120,75,20, &mtex->normapspace, 0, 0, 0, 0, "Sets space of normal map image"); + uiBlockEndAlign(block); /* crop extend clip */ @@ -3783,9 +3788,6 @@ static void material_panel_shading(Material *ma) uiBlockSetCol(block, TH_BUT_SETTING1); uiDefButBitI(block, TOG, MA_TANGENT_V, B_MATPRV, "Tangent V", 245,180,65,19, &(ma->mode), 0, 0, 0, 0, "Use the tangent vector in V direction for shading"); - /* qdn: normalmap tangents separated from shading */ - uiDefButBitI(block, TOG, MA_NORMAP_TANG, B_MATPRV, "NMap TS", 245,160,65,19, &(ma->mode), 0, 0, 0, 0, "Enable Tangent Space normal mapping"); - uiBlockBeginAlign(block); uiDefButBitI(block, TOG, MA_SHADOW, B_MATPRV, "Shadow", 245,140,65,19, &(ma->mode), 0, 0, 0, 0, "Makes material receive shadows"); uiDefButBitI(block, TOG, MA_SHADOW_TRA, B_MATPRV, "TraShadow", 245,120,65,19, &(ma->mode), 0, 0, 0, 0, "Receives transparent shadows based at material color and alpha"); @@ -4293,7 +4295,7 @@ void texture_panels() switch(tex->type) { case TEX_IMAGE: texture_panel_image(&tex->ima, &tex->iuser); - texture_panel_image_map(tex); + texture_panel_image_map(tex, mtex); break; case TEX_ENVMAP: texture_panel_envmap(tex); |