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
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-06-04 07:07:56 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-06-04 07:07:56 +0400
commit1915f1b1e250c515377149eedf58524533592ee6 (patch)
treea2a04c6a36cc325f21479a73893bb578dfdbd35c /source
parentd84c6a3cdb60c4e31db75efc4c6f9a3ea9e9f034 (diff)
quiet 2 compiler warnings and update man page
Diffstat (limited to 'source')
-rw-r--r--source/blender/imbuf/intern/targa.c2
-rw-r--r--source/blender/modifiers/intern/MOD_none.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/imbuf/intern/targa.c b/source/blender/imbuf/intern/targa.c
index 5d9f350be48..ec00b15c079 100644
--- a/source/blender/imbuf/intern/targa.c
+++ b/source/blender/imbuf/intern/targa.c
@@ -586,7 +586,7 @@ struct ImBuf *imb_loadtarga(unsigned char *mem, size_t mem_size, int flags)
ibuf->depth = size;
if (tga.mapbits != 32) { /* set alpha bits */
- cmap[0] &= BIG_LONG(0x00ffffff);
+ cmap[0] &= BIG_LONG(0x00ffffffl);
}
}
diff --git a/source/blender/modifiers/intern/MOD_none.c b/source/blender/modifiers/intern/MOD_none.c
index 489733c8480..48c5b9a4c08 100644
--- a/source/blender/modifiers/intern/MOD_none.c
+++ b/source/blender/modifiers/intern/MOD_none.c
@@ -57,7 +57,7 @@ ModifierTypeInfo modifierType_None = {
/* name */ "None",
/* structName */ "ModifierData",
/* structSize */ sizeof(ModifierData),
- /* type */ eModifierType_None,
+ /* type */ eModifierTypeType_None,
/* flags */ eModifierTypeFlag_AcceptsMesh
| eModifierTypeFlag_AcceptsCVs,