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

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton 2017-05-24 21:16:54 +10:00
commit a6c60affff
8 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -229,7 +229,7 @@ mark_as_advanced(BUILDINFO_OVERRIDE_TIME)
option(WITH_IK_ITASC "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON)
option(WITH_IK_SOLVER "Enable Legacy IK solver (only disable for development)" ON)
option(WITH_FFTW3 "Enable FFTW3 support (Used for smoke and audio effects)" ${_init_FFTW3})
option(WITH_FFTW3 "Enable FFTW3 support (Used for smoke, ocean sim, and audio effects)" ${_init_FFTW3})
option(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
option(WITH_SYSTEM_BULLET "Use the systems bullet library (currently unsupported due to missing features in upstream!)" )
mark_as_advanced(WITH_SYSTEM_BULLET)

5
intern/cycles/kernel/svm/svm_closure.h
View File

@ -150,6 +150,11 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float *
* getting lower and lower */
if(path_flag & PATH_RAY_DIFFUSE_ANCESTOR) {
subsurface = 0.0f;
/* need to set the base color in this case such that the
* rays get the correctly mixed color after transmitting
* the object */
base_color = albedo;
}
/* diffuse */

3
source/blender/alembic/intern/abc_archive.cc
View File

@ -24,6 +24,8 @@
#include "abc_archive.h"
#include "BKE_blender_version.h"
#ifdef WIN32
# include "utfconv.h"
#endif
@ -143,6 +145,7 @@ static OArchive create_archive(std::ostream *ostream,
{
md.set(Alembic::Abc::kApplicationNameKey, "Blender");
md.set(Alembic::Abc::kUserDescriptionKey, scene_name);
md.set("blender_version", versionstr);
time_t raw_time;
time(&raw_time);

2
source/blender/alembic/intern/abc_curves.cc
View File

@ -220,7 +220,7 @@ bool AbcCurveReader::accepts_object_type(const Alembic::AbcCoreAbstract::ObjectH
return false;
}
if (ob->type != OB_EMPTY) {
if (ob->type != OB_CURVE) {
*err_str = "Object type mismatch, Alembic object path points to Curves.";
return false;
}

2
source/blender/alembic/intern/abc_exporter.cc
View File

@ -585,7 +585,7 @@ void AbcExporter::createShapeWriter(Base *ob_base, Object *dupliObParent)
{
Mesh *me = static_cast<Mesh *>(ob->data);
if (!me || me->totvert == 0) {
if (!me) {
return;
}

2
source/blender/alembic/intern/abc_mesh.cc
View File

@ -354,7 +354,7 @@ bool AbcMeshWriter::isAnimated() const
md = md->next;
}
return false;
return me->adt != NULL;
}
void AbcMeshWriter::do_write()

2
source/blender/alembic/intern/abc_points.cc
View File

@ -160,7 +160,7 @@ bool AbcPointsReader::accepts_object_type(const Alembic::AbcCoreAbstract::Object
return false;
}
if (ob->type != OB_EMPTY) {
if (ob->type != OB_MESH) {
*err_str = "Object type mismatch, Alembic object path points to Points.";
return false;
}

2
source/blender/blenkernel/intern/DerivedMesh.c
View File

@ -3461,7 +3461,7 @@ void DM_calc_loop_tangents(
* have to check this is valid...
*/
mesh2tangent->precomputedLoopNormals = dm->getLoopDataArray(dm, CD_NORMAL);
mesh2tangent->precomputedFaceNormals = CustomData_get_layer(&dm->faceData, CD_NORMAL);
mesh2tangent->precomputedFaceNormals = CustomData_get_layer(&dm->polyData, CD_NORMAL);
mesh2tangent->orco = NULL;
mesh2tangent->mloopuv = CustomData_get_layer_named(&dm->loopData, CD_MLOOPUV, dm->loopData.layers[index].name);