Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 26 Sep 2017 14:24:10 +0000 (00:24 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 26 Sep 2017 14:24:10 +0000 (00:24 +1000)
source/blender/blenkernel/intern/particle_system.c
source/blender/blenloader/intern/versioning_legacy.c
source/blender/collada/AnimationExporter.cpp
source/blender/collada/DocumentImporter.cpp
source/blender/collada/GeometryExporter.cpp

index 0591ea073cce39851bd10a205a3d6a4466b31f19..ddf4f04c808fa76eae9b5fd1a912b7554388b898 100644 (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;
                }
        }
index 67b629222a22aadac02136f83e1fc2a354a004c0..55219cbaad7f5d7232940afe0416725210ddc48c 100644 (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;
                        }
                }
        }
index ffd11514ea00fa911e76c4918896d980b979b85e..299c94a6a81d86d96e31473f14475616693c1247 100644 (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);
index 2d428d6fe5d5c1759e8cce347d81833173e40bfc..39a36781e0e310c208ddd161dfd3731a168e2632 100644 (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) {
index 4365c70b910fe0c4e378a7d2c9db318755c4e8f2..27ff6b5f2b5ff4253926e3f7ff4668f0ab15fe0c 100644 (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
                                );
                        }
                }