diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-05-20 17:34:04 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-05-20 17:34:04 +0400 |
| commit | a47c673b5525fde6484d4392160fbb5101f2c108 (patch) | |
| tree | cb05981d656de969d91e12d8f74a34bfaf2ed810 /source/blender/render/intern | |
| parent | 56b726917d35ac51c86c3fd10580ac740124494d (diff) | |
2.5 Material:
* Added material "type" property, with Surface/Volume/Halo
options, compatible with sim_physics, as requested for
material buttons layout. Obviously the Volume setting
does nothing currently.
* Deprecated MA_HALO flag in favor of this.
Diffstat (limited to 'source/blender/render/intern')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 8 | ||||
| -rw-r--r-- | source/blender/render/intern/source/rendercore.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index ce324239492..4ca7244e976 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -1387,7 +1387,7 @@ static void render_new_particle(Render *re, ObjectRen *obr, DerivedMesh *dm, Mat if(ma->mode&MA_WIRE) static_particle_wire(obr, ma, loc, loc1, sd->first, sd->line); - else if(ma->mode & MA_HALO){ + else if(ma->material_type == MA_TYPE_HALO) { har= RE_inithalo_particle(re, obr, dm, ma, loc, loc1, sd->orco, sd->uvco, sd->size, 1.0, seed); if(har) har->lay= obr->ob->lay; } @@ -1593,7 +1593,7 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem path_nbr=(int)pow(2.0,(double) part->ren_step); if(path_nbr) { - if((ma->mode & (MA_HALO|MA_WIRE))==0) { + if((ma->material_type != MA_TYPE_HALO) && (ma->mode & MA_WIRE)==0) { sd.orco = MEM_mallocN(3*sizeof(float)*(totpart+totchild), "particle orcos"); set_object_orco(re, psys, sd.orco); } @@ -3035,7 +3035,7 @@ static void init_render_mesh(Render *re, ObjectRen *obr, int timeoffset) ma= give_render_material(re, ob, 1); - if(ma->mode & MA_HALO) { + if(ma->material_type == MA_TYPE_HALO) { make_render_halos(re, obr, me, totvert, mvert, ma, orco); } else { @@ -4401,7 +4401,7 @@ static int allow_render_dupli_instance(Render *re, DupliObject *dob, Object *obd if(totmaterial) { for(a= 0; a<*totmaterial; a++) { ma= give_current_material(obd, a); - if(ma && (ma->mode & MA_HALO)) + if(ma && (ma->material_type == MA_TYPE_HALO)) return 0; } } diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c index deb6f0db743..27dd43a4ef9 100644 --- a/source/blender/render/intern/source/rendercore.c +++ b/source/blender/render/intern/source/rendercore.c @@ -703,7 +703,7 @@ static void atm_tile(RenderPart *pa, RenderLayer *rl) for(sample=0; sample<totsample; sample++) { float *zrect= RE_RenderLayerGetPass(rlpp[sample], SCE_PASS_Z) + od; float *rgbrect = rlpp[sample]->rectf + 4*od; - float rgb[3]; + float rgb[3] = {0}; int done= 0; for(go=R.lights.first; go; go= go->next) { |