archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Orange; merger with bf-blender.

Browse Source 
(Merging is *not* fun work, especially not with bugfixes in main branch
for code that got cleaned up in the other! Poor Hos... :)
This commit is contained in:
Ton Roosendaal
2006-01-03 21:43:31 +00:00
parent 9557c3a66d 14d5cd1c31
commit f47899fc0f
62 changed files with 1093 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -553,9 +553,9 @@ static void drawlamp(Object *ob)
/* Inner Circle */
VECCOPY(vec, ob->obmat[3]);
glEnable(GL_BLEND);
drawcircball(GL_LINE_LOOP, vec, lampsize/2, imat);
drawcircball(GL_LINE_LOOP, vec, lampsize, imat);
glDisable(GL_BLEND);
drawcircball(GL_POLYGON, vec, lampsize/2, imat);
drawcircball(GL_POLYGON, vec, lampsize, imat);
/* restore */
if(ob->id.us>1)