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:
authorKent Mein <mein@cs.umn.edu>2005-08-17 00:21:43 +0400
committerKent Mein <mein@cs.umn.edu>2005-08-17 00:21:43 +0400
commitd408dcdaadd15332dd934bd5ff0dc6546d33107f (patch)
tree949677b0643786cd6cc708ec064812891b982ee8
parent4fed035618ae1f5429f70d912194e36cb07c1b05 (diff)
Added prototypes for some stubs to shut gcc up ;)
(In doing so found a stub that had wrong # of args) Kent
-rw-r--r--source/blender/blenkernel/BKE_bad_level_calls.h32
-rw-r--r--source/blender/blenkernel/bad_level_call_stubs/stubs.c6
-rw-r--r--source/blender/readblenfile/stub/BLO_readblenfileSTUB.c8
3 files changed, 33 insertions, 13 deletions
diff --git a/source/blender/blenkernel/BKE_bad_level_calls.h b/source/blender/blenkernel/BKE_bad_level_calls.h
index 591e1913566..e9b5f2945d8 100644
--- a/source/blender/blenkernel/BKE_bad_level_calls.h
+++ b/source/blender/blenkernel/BKE_bad_level_calls.h
@@ -76,7 +76,20 @@ extern struct ListBase editNurb;
#include "DNA_world_types.h" /* for render_types */
#include "render_types.h"
extern struct RE_Render R;
+float Blinn_Spec(float *n, float *l, float *v, float a, float b);
float Phong_Spec(float *, float *, float *, int);
+float CookTorr_Spec(float *n, float *l, float *v, int hard);
+float Toon_Spec(float *n, float *l, float *v, float a, float b);
+float WardIso_Spec(float *n, float *l, float *v, float a);
+float Toon_Diff(float *n, float *l, float *v, float a, float b);
+float OrenNayar_Diff(float *n, float *l, float *v, float rough);
+float Minnaert_Diff(float nl, float *n, float *v, float a);
+void add_to_diffuse(float *, ShadeInput *, float, float, float, float);
+void ramp_diffuse_result(float *diff, ShadeInput *shi);
+void do_specular_ramp(ShadeInput *shi, float is, float t, float *spec);
+void ramp_spec_result(float *, float *, float *, ShadeInput *);
+
+void mainqenter (unsigned short event, short val);
void waitcursor(int);
void allqueue(unsigned short event, short val);
#define REDRAWVIEW3D 0x4010
@@ -113,8 +126,8 @@ void allspace(unsigned short event, short val) ;
extern ListBase editelems;
/* object.c */
-/* void BPY_free_scriptlink(ScriptLink *slink); */
-/* void BPY_copy_scriptlink(ScriptLink *scriptlink); */
+void BPY_free_scriptlink(ScriptLink *slink);
+void BPY_copy_scriptlink(ScriptLink *scriptlink);
float *give_cursor(void); // become a callback or argument
void exit_posemode(int freedata);
@@ -127,16 +140,25 @@ short pupmenu(char *instr); // will be general callback
/* scene.c */
#include "DNA_sequence_types.h"
void free_editing(struct Editing *ed); // scenes and sequences problem...
+void BPY_do_all_scripts (short int event);
+int BPY_call_importloader(char *name);
/* texture.c */
#define FLO 128
#define INT 96
struct EnvMap;
struct Tex;
-void RE_free_envmap(struct EnvMap *env);
+
+void do_material_tex(ShadeInput *shi);
+void externtex(struct MTex *mtex, float *vec, float *tin, float *tr,
+ float *tg, float *tb, float *ta);
+void init_render_textures(void);
+void end_render_textures(void);
+
+void RE_free_envmap(struct EnvMap *env);
+void RE_free_envmapdata(struct EnvMap *env);
struct EnvMap *RE_copy_envmap(struct EnvMap *env);
-void RE_free_envmapdata(struct EnvMap *env);
-int RE_envmaptex(struct Tex *tex, float *texvec, float *dxt, float *dyt);
+int RE_envmaptex(struct Tex *tex, float *texvec, float *dxt, float *dyt);
extern char texstr[20][12]; /* buttons.c */
diff --git a/source/blender/blenkernel/bad_level_call_stubs/stubs.c b/source/blender/blenkernel/bad_level_call_stubs/stubs.c
index bd7cc60e4a6..163fc716b70 100644
--- a/source/blender/blenkernel/bad_level_call_stubs/stubs.c
+++ b/source/blender/blenkernel/bad_level_call_stubs/stubs.c
@@ -37,10 +37,6 @@
#include "BPI_script.h"
#include "DNA_material_types.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
int winqueue_break= 0;
char bprogname[1];
@@ -100,7 +96,7 @@ float CookTorr_Spec(float *n, float *l, float *v, int hard){return 0;}
float Toon_Spec(float *n, float *l, float *v, float a, float b){return 0;}
float WardIso_Spec(float *n, float *l, float *v, float a){return 0;}
float Toon_Diff(float *n, float *l, float *v, float a, float b){return 0;}
-float OrenNayar_Diff(float *n, float *l, float *v, float a, float b){return 0;}
+float OrenNayar_Diff(float *n, float *l, float *v, float rough){return 0;}
float Minnaert_Diff(float nl, float *n, float *v, float a){return 0;}
void add_to_diffuse(float *diff, ShadeInput *shi, float is, float r, float g, float b){}
void ramp_diffuse_result(float *diff, ShadeInput *shi){}
diff --git a/source/blender/readblenfile/stub/BLO_readblenfileSTUB.c b/source/blender/readblenfile/stub/BLO_readblenfileSTUB.c
index 4c52cb1b77f..d0e7cd9a117 100644
--- a/source/blender/readblenfile/stub/BLO_readblenfileSTUB.c
+++ b/source/blender/readblenfile/stub/BLO_readblenfileSTUB.c
@@ -34,9 +34,11 @@
#include <stdio.h>
#include "GEN_messaging.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+int BLO_readblenfilememory( char *fromBuffer, int fromBufferSize);
+int BLO_readblenfilename( char *fileName);
+int BLO_readblenfilehandle( int fileHandle);
+int BLO_is_a_runtime( char *file);
+int BLO_read_runtime( char *file);
int
BLO_readblenfilememory(