griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2017-09-27 00:24:10 +10:00
parent 51c87bbad0 870dfb1b5a
commit 772944a6b4
5 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/blenkernel/intern/particle_system.c
View File

@@ -2320,21 +2320,21 @@ static void collision_point_on_surface(float p[3], ParticleCollisionElement *pce
}
case 3:
{
float p0[3], e1[3], e2[3], nor[3];
float p0[3], e1[3], e2[3], nor[3];
sub_v3_v3v3(e1, pce->x1, pce->x0);
sub_v3_v3v3(e2, pce->x2, pce->x0);
sub_v3_v3v3(p0, p, pce->x0);
sub_v3_v3v3(e1, pce->x1, pce->x0);
sub_v3_v3v3(e2, pce->x2, pce->x0);
sub_v3_v3v3(p0, p, pce->x0);
cross_v3_v3v3(nor, e1, e2);
normalize_v3(nor);
cross_v3_v3v3(nor, e1, e2);
normalize_v3(nor);
if (pce->inv_nor == 1)
negate_v3(nor);
if (pce->inv_nor == 1)
negate_v3(nor);
madd_v3_v3v3fl(co, pce->x0, nor, col->radius);
madd_v3_v3fl(co, e1, pce->uv[0]);
madd_v3_v3fl(co, e2, pce->uv[1]);
madd_v3_v3v3fl(co, pce->x0, nor, col->radius);
madd_v3_v3fl(co, e1, pce->uv[0]);
madd_v3_v3fl(co, e2, pce->uv[1]);
break;
}
}

10
source/blender/blenloader/intern/versioning_legacy.c
View File

@@ -2838,12 +2838,12 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main)
Scene *sce;
for (sce = main->scene.first; sce; sce = sce->id.next) {
if (sce->toolsettings->skgen_subdivisions[0] == sce->toolsettings->skgen_subdivisions[1] ||
sce->toolsettings->skgen_subdivisions[0] == sce->toolsettings->skgen_subdivisions[2] ||
sce->toolsettings->skgen_subdivisions[1] == sce->toolsettings->skgen_subdivisions[2])
sce->toolsettings->skgen_subdivisions[0] == sce->toolsettings->skgen_subdivisions[2] ||
sce->toolsettings->skgen_subdivisions[1] == sce->toolsettings->skgen_subdivisions[2])
{
sce->toolsettings->skgen_subdivisions[0] = SKGEN_SUB_CORRELATION;
sce->toolsettings->skgen_subdivisions[1] = SKGEN_SUB_LENGTH;
sce->toolsettings->skgen_subdivisions[2] = SKGEN_SUB_ANGLE;
sce->toolsettings->skgen_subdivisions[0] = SKGEN_SUB_CORRELATION;
sce->toolsettings->skgen_subdivisions[1] = SKGEN_SUB_LENGTH;
sce->toolsettings->skgen_subdivisions[2] = SKGEN_SUB_ANGLE;
}
}
}

24
source/blender/collada/AnimationExporter.cpp
View File

@@ -313,12 +313,12 @@ void AnimationExporter::dae_animation(Object *ob, FCurve *fcu, char *transformNa
if (ob->type == OB_ARMATURE) {
ob_name = getObjectBoneName(ob, fcu);
BLI_snprintf(
anim_id,
sizeof(anim_id),
"%s_%s.%s",
(char *)translate_id(ob_name).c_str(),
(char *)translate_id(transformName).c_str(),
axis_name);
anim_id,
sizeof(anim_id),
"%s_%s.%s",
(char *)translate_id(ob_name).c_str(),
(char *)translate_id(transformName).c_str(),
axis_name);
}
else {
if (ma)
@@ -327,12 +327,12 @@ void AnimationExporter::dae_animation(Object *ob, FCurve *fcu, char *transformNa
ob_name = id_name(ob);
BLI_snprintf(
anim_id,
sizeof(anim_id),
"%s_%s_%s",
(char *)translate_id(ob_name).c_str(),
(char *)getAnimationPathId(fcu).c_str(),
axis_name);
anim_id,
sizeof(anim_id),
"%s_%s_%s",
(char *)translate_id(ob_name).c_str(),
(char *)getAnimationPathId(fcu).c_str(),
axis_name);
}
openAnimation(anim_id, COLLADABU::Utils::EMPTY_STRING);

6
source/blender/collada/DocumentImporter.cpp
View File

@@ -511,9 +511,9 @@ std::vector<Object *> *DocumentImporter::write_node(COLLADAFW::Node *node, COLLA
std::vector<Object *> *root_objects = new std::vector<Object *>();
fprintf(stderr,
"Writing node id='%s', name='%s'\n",
id.c_str(),
name.c_str());
"Writing node id='%s', name='%s'\n",
id.c_str(),
name.c_str());
if (is_joint) {
if (parent_node == NULL && !is_library_node) {

6
source/blender/collada/GeometryExporter.cpp
View File

@@ -495,9 +495,9 @@ void GeometryExporter::createVertexColorSource(std::string geom_id, Mesh *me)
MLoopCol *mlc = mloopcol + mpoly->loopstart;
for (int j = 0; j < mpoly->totloop; j++, mlc++) {
source.appendValues(
mlc->r / 255.0f,
mlc->g / 255.0f,
mlc->b / 255.0f
mlc->r / 255.0f,
mlc->g / 255.0f,
mlc->b / 255.0f
);
}
}