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:
authorJoshua Leung <aligorith@gmail.com>2009-11-11 12:59:51 +0300
committerJoshua Leung <aligorith@gmail.com>2009-11-11 12:59:51 +0300
commit6dcb4ac7a4e50247022eb17794b47b38e34dcd82 (patch)
tree4f097e3663bfb9e7c2099d119c2f46708e351cf0 /source/blender/render
parent5c69f19904a4e8aba4b6f89cb90fe41bc303c0ff (diff)
* Fixing various compiler warnings under scons+mingw. Mostly unused variables and functions.
* Added missing lib-linking code for Grease Pencil in nodetrees * Uncommented some code for curve shapekeys
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/pointdensity.c1
-rw-r--r--source/blender/render/intern/source/volume_precache.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index e808d70da33..9ce77f751c0 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -190,7 +190,6 @@ static void pointdensity_cache_object(Render *re, PointDensity *pd, Object *ob)
int i;
DerivedMesh *dm;
MVert *mvert = NULL;
- float cam_mat[4][4];
dm = mesh_create_derived_render(re->scene, ob, CD_MASK_BAREMESH|CD_MASK_MTFACE|CD_MASK_MCOL);
mvert= dm->getVertArray(dm); /* local object space */
diff --git a/source/blender/render/intern/source/volume_precache.c b/source/blender/render/intern/source/volume_precache.c
index 4ec30721274..e9162b7367f 100644
--- a/source/blender/render/intern/source/volume_precache.c
+++ b/source/blender/render/intern/source/volume_precache.c
@@ -175,6 +175,7 @@ static void lightcache_filter(VolumePrecache *vp)
}
}
+#if 0
static void lightcache_filter2(VolumePrecache *vp)
{
int x, y, z;
@@ -211,6 +212,7 @@ static void lightcache_filter2(VolumePrecache *vp)
if (new_g) { MEM_freeN(new_g); new_g=NULL; }
if (new_b) { MEM_freeN(new_b); new_b=NULL; }
}
+#endif
static inline int ms_I(int x, int y, int z, int *n) //has a pad of 1 voxel surrounding the core for boundary simulation
{