Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Strand render bugfixes:

Browse Source 
- Accidentally made minimum blender unit strand size bigger again.
- Make layer option for lamps work.
This commit is contained in:
Brecht Van Lommel
2007-12-04 16:55:01 +00:00
parent 1e1ee08edb
commit c50dfa4379
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/render/intern/source/strand.c
View File

@@ -610,6 +610,7 @@ void strand_shade_point(Render *re, ShadeSample *ssamp, StrandSegment *sseg, Str
memset(&vlr, 0, sizeof(vlr)); memset(&vlr, 0, sizeof(vlr));
vlr.flag= R_SMOOTH|R_VISIBLE; vlr.flag= R_SMOOTH|R_VISIBLE;
vlr.lay= sseg->strand->buffer->lay;
if(sseg->buffer->ma->mode & MA_TANGENT_STR) if(sseg->buffer->ma->mode & MA_TANGENT_STR)
vlr.flag |= R_TANGENT; vlr.flag |= R_TANGENT;
shi->vlr= &vlr; shi->vlr= &vlr;

4
source/blender/src/buttons_shading.c
View File

@@ -3868,8 +3868,8 @@ static uiBlock *strand_menu(void *mat_v)
uiBlockBeginAlign(block); uiBlockBeginAlign(block);
uiDefButBitI(block, TOG, MA_STR_B_UNITS, 0, "Use Blender Units", 10,95,230,20, &(ma->mode), 0, 0, 0, 0, "Use actual Blender units for widths instead of pixels"); uiDefButBitI(block, TOG, MA_STR_B_UNITS, 0, "Use Blender Units", 10,95,230,20, &(ma->mode), 0, 0, 0, 0, "Use actual Blender units for widths instead of pixels");
if(ma->mode & MA_STR_B_UNITS){ if(ma->mode & MA_STR_B_UNITS){
uiDefButF(block, NUMSLI, 0, "Start ", 10, 75, 230,20, &ma->strand_sta, 0.01, 20.0, 2, 0, "Start size of strands in Blender units"); uiDefButF(block, NUMSLI, 0, "Start ", 10, 75, 230,20, &ma->strand_sta, 0.0001, 2.0, 2, 0, "Start size of strands in Blender units");
uiDefButF(block, NUMSLI, 0, "End ", 10, 55, 230,20, &ma->strand_end, 0.01, 10.0, 2, 0, "End size of strands in Blender units"); uiDefButF(block, NUMSLI, 0, "End ", 10, 55, 230,20, &ma->strand_end, 0.0001, 1.0, 2, 0, "End size of strands in Blender units");
} }
else{ else{
uiDefButF(block, NUMSLI, 0, "Start ", 10, 75, 230,20, &ma->strand_sta, 0.25, 20.0, 2, 0, "Start size of strands in pixels"); uiDefButF(block, NUMSLI, 0, "Start ", 10, 75, 230,20, &ma->strand_sta, 0.25, 20.0, 2, 0, "Start size of strands in pixels");