Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaia Clary <gaia.clary@machinimatrix.org>2018-02-25 02:06:41 +0300
committerGaia Clary <gaia.clary@machinimatrix.org>2018-02-25 02:06:41 +0300
commit2b158861a3a516dd8f4dac73f8984230f02bc9de (patch)
tree9f53ceec22962a730b3ca50c1f252ec71c5a26e6 /source/blenderplayer
parent94eb1897523d4cf464ea0cdf90ccbd7db90f997d (diff)
parentd91f2ac37aa02d96a00d116fa55cdc9f55afd32c (diff)
merged collada rework from master into blender 2.8
Diffstat (limited to 'source/blenderplayer')
-rw-r--r--source/blenderplayer/bad_level_call_stubs/stubs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index a0cb8ed8c98..28f413299a5 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -838,6 +838,7 @@ int collada_export(const struct EvaluationContext *eval_ctx,
int include_armatures,
int include_shapekeys,
int deform_bones_only,
+ int sampling_rate,
int active_uv_only,
int include_material_textures,