Commit: 13c58a436ee04aecbbb7a2be4288d45f7bdc8f33
Author: Stefan Werner
Date: Fri Nov 3 21:54:58 2017 +0100
Branches: temp_cryptomatte
https://developer.blender.org/rB13c58a436ee04aecbbb7a2be4288d45f7bdc8f33
build fixes.
Cryptomatte code was using some C++11 and blenderplayer had a duplicatestub.
===================================================================
M source/blender/compositor/operations/COM_CryptomatteOperation.cpp
M source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
diff --git a/source/blender/compositor/operations/COM_CryptomatteOperation.cpp
b/source/blender/compositor/operations/COM_CryptomatteOperation.cpp
index 6f911591268..89a6185baca 100644
--- a/source/blender/compositor/operations/COM_CryptomatteOperation.cpp
+++ b/source/blender/compositor/operations/COM_CryptomatteOperation.cpp
@@ -61,11 +61,11 @@ void CryptomatteOperation::executePixel(float output[4],
output[1] = ((float) ((m3hash << 8)) / (float)
UINT32_MAX);
output[2] = ((float) ((m3hash << 16)) / (float)
UINT32_MAX);
}
- for(float f : m_objectIndex) {
- if (f == input[0]) {
+ for(size_t i = 0; i < m_objectIndex.size(); i++) {
+ if (m_objectIndex[i] == input[0]) {
output[3] += input[1];
}
- if (f == input[2]) {
+ if (m_objectIndex[i] == input[2]) {
output[3] += input[3];
}
}
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c
b/source/blenderplayer/bad_level_call_stubs/stubs.c
index dbde3936fe5..4bfc8697b22 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -247,8 +247,7 @@ void RE_SetActiveRenderView(struct Render *re, const char
*viewname) RET_NONE
struct RenderPass *RE_pass_find_by_name(volatile struct RenderLayer *rl, const
char *name, const char *viewname) RET_NULL
struct RenderPass *RE_pass_find_by_type(volatile struct RenderLayer *rl, int
passtype, const char *viewname) RET_NULL
bool RE_HasFakeLayer(RenderResult *res) RET_ZERO
-void RE_engine_register_pass(struct RenderEngine *engine, struct Scene *scene,
struct SceneRenderLayer *srl,
- const char *name, int channels, const char
*chanid, int type) RET_NULL
+
/* zbuf.c stub */
void antialias_tagbuf(int xsize, int ysize, char *rectmove) RET_NONE
void RE_zbuf_accumulate_vecblur(struct NodeBlurData *nbd, int xsize, int
ysize, float *newrect, const float *imgrect, float *vecbufrect, const float
*zbufrect) RET_NONE
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
