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

Merge branch 'master' into blender2.8

Browse Source 
Conflicts:
	intern/cycles/blender/blender_particles.cpp
	source/blender/blenkernel/intern/particle.c
	source/blender/gpu/intern/gpu_shader.c
This commit is contained in:
Bastien Montagne
2016-09-04 16:41:06 +02:00
parent 498583844f e76e8fcdcc
commit 3c29aad787
164 changed files with 7974 additions and 5976 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
intern/elbeem/intern/controlparticles.cpp
View File

@@ -1316,7 +1316,8 @@ void ControlParticles::finishControl(std::vector<ControlForces> &forces, LbmFloa
if(cvweight>1.) { cvweight = 1.; }
// thus cvweight is in the range of 0..influenceVelocity, currently not normalized by numCParts
cvweight *= ivel;
if(cvweight<0.) cvweight=0.; if(cvweight>1.) cvweight=1.;
if(cvweight<0.) cvweight=0.;
if(cvweight>1.) cvweight=1.;
// LBM, FIXME todo use relaxation factor
//pvel = (cvel*0.5 * cvweight) + (pvel * (1.0-cvweight));
forces[i].weightVel = cvweight;

6
intern/elbeem/intern/isosurface.h
View File

@@ -67,8 +67,10 @@ class IsoSurface :
/*! set # of subdivisions, this has to be done before init! */
void setSubdivs(int s) {
if(mInitDone) errFatal("IsoSurface::setSubdivs","Changing subdivs after init!", SIMWORLD_INITERROR);
if(s<1) s=1; if(s>10) s=10;
mSubdivs = s; }
if(s<1) s=1;
if(s>10) s=10;
mSubdivs = s;
}
int getSubdivs() { return mSubdivs;}
/*! set full edge settings, this has to be done before init! */
void setUseFulledgeArrays(bool set) {