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:
authorKévin Dietrich <kevin.dietrich@mailoo.org>2016-01-06 03:33:12 +0300
committerKévin Dietrich <kevin.dietrich@mailoo.org>2016-01-06 03:33:12 +0300
commit7e6d09608b015a52bb6a731d9b9461d21b8d3afa (patch)
tree2b5b8c48f8aa7ed28d48bb67e5a58ed028c0e57d
parent8c8215fb77e148e21b19a34cc10ee0e3c9680220 (diff)
Fix Blender Player linking issue.
Removed the conflicting declaration since it is not needed anymore, as the stipple arrays are now only used in gpu_shader_basic.c.
-rw-r--r--source/blenderplayer/bad_level_call_stubs/stubs.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 5748b9e3225..4d0840ece74 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -278,7 +278,6 @@ void RE_DataBase_GetView(struct Render *re, float mat[4][4]) RET_NONE
int externtex(struct MTex *mtex, const float vec[3], float *tin, float *tr, float *tg, float *tb, float *ta, const int thread, struct ImagePool *pool, const bool skip_load_image) RET_ZERO
float texture_value_blend(float tex, float out, float fact, float facg, int blendtype) RET_ZERO
void texture_rgb_blend(float in[3], const float tex[3], const float out[3], float fact, float facg, int blendtype) RET_NONE
-const unsigned char stipple_quarttone[128];
double elbeemEstimateMemreq(int res, float sx, float sy, float sz, int refine, char *retstr) RET_ZERO
struct Render *RE_NewRender(const char *name) RET_NULL
void RE_SwapResult(struct Render *re, struct RenderResult **rr) RET_NONE