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>2012-03-04 15:58:55 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-03-04 15:58:55 +0400
commit12d0489b33a16d2aca32d5d734a3c433a730eb54 (patch)
treeaf107e3f61b3710985633d616d764ee075215fa9
parent34db81a6dc9176e74beee656e4bc03971dc22430 (diff)
fix for building openjpeg image support on OpenSUSE 12.1, also quiet compile warning.
-rw-r--r--source/blender/blenkernel/intern/editderivedmesh.c4
-rw-r--r--source/blender/imbuf/intern/jp2.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c
index 0080367d9d0..fa60ae42bac 100644
--- a/source/blender/blenkernel/intern/editderivedmesh.c
+++ b/source/blender/blenkernel/intern/editderivedmesh.c
@@ -191,7 +191,7 @@ static void BMEdit_RecalcTessellation_intern(BMEditMesh *tm)
else {
ScanFillVert *v, *lastv=NULL, *firstv=NULL;
- ScanFillEdge *e;
+ /* ScanFillEdge *e; */ /* UNUSED */
ScanFillFace *efa;
int totfilltri;
@@ -206,7 +206,7 @@ static void BMEdit_RecalcTessellation_intern(BMEditMesh *tm)
v->tmp.p = l;
if (lastv) {
- e = BLI_addfilledge(lastv, v);
+ /* e = */ BLI_addfilledge(lastv, v);
}
lastv = v;
diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c
index 3d88a24ba37..1892aa459a6 100644
--- a/source/blender/imbuf/intern/jp2.c
+++ b/source/blender/imbuf/intern/jp2.c
@@ -329,7 +329,7 @@ static int initialise_4K_poc(opj_poc_t *POC, int numres)
static void cinema_parameters(opj_cparameters_t *parameters)
{
- parameters->tile_size_on = false;
+ parameters->tile_size_on = FALSE;
parameters->cp_tdx=1;
parameters->cp_tdy=1;