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>2009-07-31 05:40:15 +0400
committerCampbell Barton <ideasman42@gmail.com>2009-07-31 05:40:15 +0400
commit2a727083c9cf6bb10b7506e8ed365831c458babc (patch)
treea992628090a4526f8874311f6b5e44ab98e3ecce /source/blender/editors/preview
parentc371f49d9aaf2c9eca90329954fe217efb5cf3f6 (diff)
fix for warnings and implicit declarations
also fixed smoke comparing a float's mem-location rather then its value.
Diffstat (limited to 'source/blender/editors/preview')
-rw-r--r--source/blender/editors/preview/previewrender.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/preview/previewrender.c b/source/blender/editors/preview/previewrender.c
index b542b362ae0..c5a741b11ed 100644
--- a/source/blender/editors/preview/previewrender.c
+++ b/source/blender/editors/preview/previewrender.c
@@ -892,7 +892,7 @@ static void shader_preview_render(ShaderPreview *sp, ID *id, int split, int firs
/* handle results */
if(sp->pr_method==PR_ICON_RENDER) {
if(sp->pr_rect)
- RE_ResultGet32(re, sp->pr_rect);
+ RE_ResultGet32(re, (unsigned int *)sp->pr_rect);
}
else {
/* validate owner */
@@ -963,7 +963,7 @@ void ED_preview_shader_job(const bContext *C, void *owner, ID *id, ID *parent, i
}
/* rect should be allocated, sizex/sizy pixels, 32 bits */
-void ED_preview_iconrender(Scene *scene, ID *id, int *rect, int sizex, int sizey)
+void ED_preview_iconrender(Scene *scene, ID *id, unsigned int *rect, int sizex, int sizey)
{
ShaderPreview *sp;
short stop=0, do_update=0;
@@ -975,7 +975,7 @@ void ED_preview_iconrender(Scene *scene, ID *id, int *rect, int sizex, int sizey
sp->sizex= sizex;
sp->sizey= sizey;
sp->pr_method= PR_ICON_RENDER;
- sp->pr_rect= rect;
+ sp->pr_rect= (int *)rect; /* shouldnt pr_rect be unsigned int also? - Campbell */
sp->id = id;
shader_preview_startjob(sp, &stop, &do_update);