diff options
| -rw-r--r-- | source/blender/blenlib/intern/BLI_ghash.c | 4 | ||||
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_edgenet.c | 4 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/BL_BlenderShader.cpp | 1 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/BL_BlenderShader.h | 1 |
4 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c index 8221393d4d5..03f5d60079b 100644 --- a/source/blender/blenlib/intern/BLI_ghash.c +++ b/source/blender/blenlib/intern/BLI_ghash.c @@ -69,7 +69,7 @@ typedef struct Entry { void *key, *val; } Entry; -typedef struct GHash { +struct GHash { GHashHashFP hashfp; GHashCmpFP cmpfp; @@ -78,7 +78,7 @@ typedef struct GHash { unsigned int nbuckets; unsigned int nentries; unsigned short cursize, flag; -} GHash; +}; /* -------------------------------------------------------------------- */ diff --git a/source/blender/bmesh/tools/bmesh_edgenet.c b/source/blender/bmesh/tools/bmesh_edgenet.c index ed5d47e9391..18efb9acd78 100644 --- a/source/blender/bmesh/tools/bmesh_edgenet.c +++ b/source/blender/bmesh/tools/bmesh_edgenet.c @@ -117,7 +117,7 @@ static unsigned int bm_edgenet_path_from_pass( v_ls_tot += 1; v = vn->prev; vn = &vnet_info[BM_elem_index_get(v)]; - } while ((vn->pass == pass)); + } while (vn->pass == pass); return v_ls_tot; } @@ -145,7 +145,7 @@ static bool bm_edgenet_path_check_overlap( v_ls_tot += 1; v = vn->prev; vn = &vnet_info[BM_elem_index_get(v)]; - } while ((vn->pass == pass)); + } while (vn->pass == pass); } if (v_ls_tot) { diff --git a/source/gameengine/Ketsji/BL_BlenderShader.cpp b/source/gameengine/Ketsji/BL_BlenderShader.cpp index 97dc8f72aec..6f6925dcf76 100644 --- a/source/gameengine/Ketsji/BL_BlenderShader.cpp +++ b/source/gameengine/Ketsji/BL_BlenderShader.cpp @@ -44,7 +44,6 @@ BL_BlenderShader::BL_BlenderShader(KX_Scene *scene, struct Material *ma, int lightlayer) : - mScene(scene), mMat(ma), mLightLayer(lightlayer), mGPUMat(NULL) diff --git a/source/gameengine/Ketsji/BL_BlenderShader.h b/source/gameengine/Ketsji/BL_BlenderShader.h index 6d56c06e090..e03bb5a11d9 100644 --- a/source/gameengine/Ketsji/BL_BlenderShader.h +++ b/source/gameengine/Ketsji/BL_BlenderShader.h @@ -57,7 +57,6 @@ class BL_Material; class BL_BlenderShader { private: - KX_Scene *mScene; struct Scene *mBlenderScene; struct Material *mMat; int mLightLayer; |