[Bf-blender-cvs] [7e6d096] master: Fix Blender Player linking issue.
Kévin Dietrich
noreply at git.blender.org
Wed Jan 6 01:35:07 CET 2016
Commit: 7e6d09608b015a52bb6a731d9b9461d21b8d3afa
Author: Kévin Dietrich
Date: Wed Jan 6 01:33:12 2016 +0100
Branches: master
https://developer.blender.org/rB7e6d09608b015a52bb6a731d9b9461d21b8d3afa
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.
===================================================================
M source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 5748b9e..4d0840e 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
More information about the Bf-blender-cvs
mailing list