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-11-24 16:24:36 +0300
committerGaia Clary <gaia.clary@machinimatrix.org>2018-11-24 16:30:19 +0300
commit0c8b0771f26120d557c80df1a30905c8228fd702 (patch)
treea0d52c27b7a4b19d9b140942ffeb58f79dceded3 /source/blender/collada/Materials.cpp
parent31e3b7790affbde212bb2ccc6d5195a684010928 (diff)
refactor: Collada reorganize class constructors
- Class constructors without body (only attribute initialisations) can safely be kept in the class header files - Constructor variables should be initialized in the order of their definition in the header files This change is also aimed to remove a couple of build warnings from the linux builds.
Diffstat (limited to 'source/blender/collada/Materials.cpp')
-rw-r--r--source/blender/collada/Materials.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/Materials.cpp b/source/blender/collada/Materials.cpp
index de0405da93a..3173c2592c4 100644
--- a/source/blender/collada/Materials.cpp
+++ b/source/blender/collada/Materials.cpp
@@ -24,8 +24,8 @@
MaterialNode::MaterialNode(bContext *C, Material *ma, KeyImageMap &key_image_map) :
mContext(C),
- effect(nullptr),
material(ma),
+ effect(nullptr),
key_image_map(&key_image_map)
{
ntree = prepare_material_nodetree();
@@ -34,8 +34,8 @@ MaterialNode::MaterialNode(bContext *C, Material *ma, KeyImageMap &key_image_map
MaterialNode::MaterialNode(bContext *C, COLLADAFW::EffectCommon *ef, Material *ma, UidImageMap &uid_image_map) :
mContext(C),
- effect(ef),
material(ma),
+ effect(ef),
uid_image_map(&uid_image_map)
{
ntree = prepare_material_nodetree();