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:
authorCampbell Barton <ideasman42@gmail.com>2019-01-15 15:57:49 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-01-15 16:03:03 +0300
commit88a80fcec8672b5bb67041456dc7f7101aae3d55 (patch)
treee1b93fd997bba2e0481395bb51b51058eb9aa990 /source/blender/collada
parent2d98dce7ee29b7e5d685ee5de9aa1e4eebe46a01 (diff)
Cleanup: commas at the end of enums
Without this clang-format may wrap them onto a single line.
Diffstat (limited to 'source/blender/collada')
-rw-r--r--source/blender/collada/AnimationImporter.h8
-rw-r--r--source/blender/collada/Materials.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/collada/AnimationImporter.h b/source/blender/collada/AnimationImporter.h
index d6d5ad03a88..1116ebbfca1 100644
--- a/source/blender/collada/AnimationImporter.h
+++ b/source/blender/collada/AnimationImporter.h
@@ -100,7 +100,7 @@ private:
// INANIMATE = 0,
LIGHT_COLOR = 2,
LIGHT_FOA = 4,
- LIGHT_FOE = 8
+ LIGHT_FOE = 8,
};
enum cameraAnim
@@ -111,7 +111,7 @@ private:
CAMERA_YFOV = 8,
CAMERA_YMAG = 16,
CAMERA_ZFAR = 32,
- CAMERA_ZNEAR = 64
+ CAMERA_ZNEAR = 64,
};
enum matAnim
@@ -120,13 +120,13 @@ private:
MATERIAL_SPEC_COLOR = 4,
MATERIAL_DIFF_COLOR = 1 << 3,
MATERIAL_TRANSPARENCY = 1 << 4,
- MATERIAL_IOR = 1 << 5
+ MATERIAL_IOR = 1 << 5,
};
enum AnimationType
{
BC_INANIMATE = 0,
- BC_NODE_TRANSFORM = 1
+ BC_NODE_TRANSFORM = 1,
};
struct AnimMix
diff --git a/source/blender/collada/Materials.h b/source/blender/collada/Materials.h
index 69f64a6280d..925158e52fa 100644
--- a/source/blender/collada/Materials.h
+++ b/source/blender/collada/Materials.h
@@ -40,7 +40,7 @@ extern "C" {
typedef enum BC_pbr_inputs {
BC_PBR_DIFFUSE = 0,
BC_PBR_METALLIC = 4,
- BC_PBR_IOR = 14
+ BC_PBR_IOR = 14,
} BC_pbr_inputs;
typedef std::map<std::string, bNode *> NodeMap;