kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

* Remove more code for stars, missed those. Sorry!

Browse Source
This commit is contained in:
Thomas Dinges 2013-11-20 19:37:23 +01:00
parent 30512d7c55
commit b0ea93aa9d
7 changed files with 1 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/space_view3d/space_view3d.c
View File

@ -843,14 +843,6 @@ static void view3d_main_area_listener(bScreen *sc, ScrArea *sa, ARegion *ar, wmN
case ND_WORLD_DRAW:
/* handled by space_view3d_listener() for v3d access */
break;
case ND_WORLD_STARS:
{
RegionView3D *rv3d = ar->regiondata;
if (rv3d->persp == RV3D_CAMOB) {
ED_region_tag_redraw(ar);
}
break;
}
}
break;
case NC_LAMP:

15
source/blender/editors/space_view3d/view3d_draw.c
View File

@ -106,21 +106,6 @@ extern void bl_debug_draw_quad_add(const float v0[3], const float v1[3], const f
extern void bl_debug_draw_edge_add(const float v0[3], const float v1[3]);
#endif
static void star_stuff_init_func(void)
{
cpack(0xFFFFFF);
glPointSize(1.0);
glBegin(GL_POINTS);
}
static void star_stuff_vertex_func(const float vec[3])
{
glVertex3fv(vec);
}
static void star_stuff_term_func(void)
{
glEnd();
}
void circf(float x, float y, float rad)
{
GLUquadricObj *qobj = gluNewQuadric();

3
source/blender/makesdna/DNA_world_types.h
View File

@ -47,7 +47,7 @@ struct MTex;
/**
* World defines general modeling data such as a background fill,
* gravity, color model, stars, etc. It mixes game-data, rendering
* gravity, color model etc. It mixes game-data, rendering
* data and modeling data. */
typedef struct World {
ID id;
@ -96,7 +96,6 @@ typedef struct World {
float misi, miststa, mistdist, misthi;
float starr DNA_DEPRECATED, starg DNA_DEPRECATED, starb DNA_DEPRECATED, stark DNA_DEPRECATED; /* Deprecated */
float starsize DNA_DEPRECATED, starmindist DNA_DEPRECATED;
float stardist DNA_DEPRECATED, starcolnoise DNA_DEPRECATED;

1
source/blender/makesrna/RNA_access.h
View File

@ -660,7 +660,6 @@ extern StructRNA RNA_World;
extern StructRNA RNA_WorldAmbientOcclusion;
extern StructRNA RNA_WorldLighting;
extern StructRNA RNA_WorldMistSettings;
extern StructRNA RNA_WorldStarsSettings;
extern StructRNA RNA_WorldTextureSlot;
extern StructRNA RNA_XnorController;
extern StructRNA RNA_XorController;

27
source/blender/render/intern/source/convertblender.c
View File

@ -134,32 +134,6 @@
# pragma GCC diagnostic ignored "-Wdouble-promotion"
#endif
/* ------------------------------------------------------------------------- */
/* Stuff for stars. This sits here because it uses gl-things. Part of
* this code may move down to the converter. */
/* ------------------------------------------------------------------------- */
/* this is a bad beast, since it is misused by the 3d view drawing as well. */
static HaloRen *initstar(Render *re, ObjectRen *obr, const float vec[3], float hasize)
{
HaloRen *har;
float hoco[4];
projectverto(vec, re->winmat, hoco);
har= RE_findOrAddHalo(obr, obr->tothalo++);
/* projectvert is done in function zbufvlaggen again, because of parts */
copy_v3_v3(har->co, vec);
har->hasize= hasize;
har->zd= 0.0;
har->pool = re->pool;
return har;
}
/* ------------------------------------------------------------------------- */
/* tool functions/defines for ad hoc simplification and possible future
* cleanup */
@ -5199,7 +5173,6 @@ void RE_Database_Preprocess(Render *re)
if (!re->test_break(re->tbh)) {
int tothalo;
/* don't sort stars */
tothalo= re->tothalo;
sort_halos(re, tothalo);

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

@ -289,7 +289,6 @@ int shadeHaloFloat(HaloRen *har, float col[4], int zz,
if (R.wrld.mode & WO_MIST) {
if (har->type & HA_ONLYSKY) {
/* stars but no mist */
alpha= har->alfa;
}
else {

1
source/blender/windowmanager/WM_types.h
View File

@ -311,7 +311,6 @@ typedef struct wmNotifier {
/* NC_WORLD World */
#define ND_WORLD_DRAW (45<<16)
#define ND_WORLD_STARS (46<<16)
/* NC_TEXT Text */
#define ND_CURSOR (50<<16)