diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-07 12:48:49 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-07 12:48:56 +0300 |
| commit | b48156d0122518541df58568c426ba21670a710f (patch) | |
| tree | 9192d4883dc324c4c278ed89556a7175680f3a53 /source/blender/collada | |
| parent | 20261a7581df8b2f06f48366e37e4b94ba9b3719 (diff) | |
Cleanup: style
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/BCAnimationCurve.cpp | 8 | ||||
| -rw-r--r-- | source/blender/collada/BCAnimationSampler.h | 2 | ||||
| -rw-r--r-- | source/blender/collada/collada_utils.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/collada/BCAnimationCurve.cpp b/source/blender/collada/BCAnimationCurve.cpp index 87cf07cc21c..74d852ae980 100644 --- a/source/blender/collada/BCAnimationCurve.cpp +++ b/source/blender/collada/BCAnimationCurve.cpp @@ -69,7 +69,7 @@ void BCAnimationCurve::init_pointer_rna(Object *ob) switch (this->curve_key.get_animation_type()) { case BC_ANIMATION_TYPE_BONE: { - bArmature * arm = (bArmature *)ob->data; + bArmature *arm = (bArmature *)ob->data; RNA_id_pointer_create(&arm->id, &id_ptr); } break; @@ -86,13 +86,13 @@ void BCAnimationCurve::init_pointer_rna(Object *ob) break; case BC_ANIMATION_TYPE_CAMERA: { - Camera * camera = (Camera *)ob->data; + Camera *camera = (Camera *)ob->data; RNA_id_pointer_create(&camera->id, &id_ptr); } break; case BC_ANIMATION_TYPE_LIGHT: { - Lamp * lamp = (Lamp *)ob->data; + Lamp *lamp = (Lamp *)ob->data; RNA_id_pointer_create(&lamp->id, &id_ptr); } break; @@ -188,7 +188,7 @@ const std::string BCAnimationCurve::get_animation_name(Object *ob) const case BC_ANIMATION_TYPE_MATERIAL: { - Material * ma = give_current_material(ob, this->curve_key.get_subindex() + 1); + Material *ma = give_current_material(ob, this->curve_key.get_subindex() + 1); name = id_name(ob) + "-" + id_name(ma) + "-material"; } break; diff --git a/source/blender/collada/BCAnimationSampler.h b/source/blender/collada/BCAnimationSampler.h index 8bf2967a44f..ae0a04a706c 100644 --- a/source/blender/collada/BCAnimationSampler.h +++ b/source/blender/collada/BCAnimationSampler.h @@ -150,7 +150,7 @@ public: } BCSample &add(Object *ob, int frame_index); - BCSampleFrame * get_frame(int frame_index); // returns NULL if frame does not exist + BCSampleFrame *get_frame(int frame_index); // returns NULL if frame does not exist const int get_frames(std::vector<int> &frames) const; const int get_frames(Object *ob, BCFrames &frames) const; diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index 33f74968782..c7aed84986d 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -1314,7 +1314,7 @@ static bNodeSocket *bc_group_add_output_socket(bNodeTree *ntree, bNode *from_nod void bc_make_group(bContext *C, bNodeTree *ntree, std::map<std::string, bNode *> nmap) { - bNode * gnode = node_group_make_from_selected(C, ntree, "ShaderNodeGroup", "ShaderNodeTree"); + bNode *gnode = node_group_make_from_selected(C, ntree, "ShaderNodeGroup", "ShaderNodeTree"); bNodeTree *gtree = (bNodeTree *)gnode->id; bc_group_add_input_socket(gtree, nmap["main"], 0, "Diffuse"); |