diff options
author | Benoit Bolsee <benoit.bolsee@online.be> | 2016-02-21 01:22:29 +0300 |
---|---|---|
committer | Benoit Bolsee <benoit.bolsee@online.be> | 2016-02-21 01:22:29 +0300 |
commit | 12bb5bdabf51eca1cc8fd236df2c4606b5e963aa (patch) | |
tree | b866a273482f473e88c9589dd4b8e5257d0abae6 /source/blenderplayer | |
parent | e1963ddc30476e4f9a833b0ab1f90ef6ce895d9b (diff) | |
parent | 4e95807db3e17c647001ba4112371217d0d2506b (diff) |
Merge remote-tracking branch 'origin/master' into decklink
Conflicts:
source/gameengine/Ketsji/KX_KetsjiEngine.cpp
Diffstat (limited to 'source/blenderplayer')
-rw-r--r-- | source/blenderplayer/CMakeLists.txt | 16 | ||||
-rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 15 |
2 files changed, 22 insertions, 9 deletions
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index eaf92d18e2e..b543ac43378 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -54,7 +54,10 @@ if(WIN32 AND NOT UNIX) ) endif() - add_executable(blenderplayer ${EXETYPE} bad_level_call_stubs/stubs.c ../icons/winblender.rc) + add_executable( + blenderplayer ${EXETYPE} + bad_level_call_stubs/stubs.c + ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.rc) install(TARGETS blenderplayer COMPONENT Blenderplayer @@ -150,7 +153,6 @@ endif() bf_imbuf_openexr bf_imbuf_openimageio extern_openjpeg - extern_redcode bf_imbuf_dds bf_dna ge_videotex @@ -226,6 +228,10 @@ endif() list(APPEND BLENDER_SORTED_LIBS bf_intern_opensubdiv) endif() + if(WITH_OPENVDB) + list(APPEND BLENDER_SORTED_LIBS bf_intern_openvdb) + endif() + foreach(SORTLIB ${BLENDER_SORTED_LIBS}) set(REMLIB ${SORTLIB}) foreach(SEARCHLIB ${BLENDER_LINK_LIBS}) @@ -263,5 +269,9 @@ setup_liblinks(blenderplayer) # We put CLEW and CUEW here because OPENSUBDIV_LIBRARIES dpeends on them.. if(WITH_CYCLES OR WITH_COMPOSITOR OR WITH_OPENSUBDIV) target_link_libraries(blenderplayer "extern_clew") - target_link_libraries(blenderplayer "extern_cuew") + if(WITH_CUDA_DYNLOAD) + target_link_libraries(blenderplayer "extern_cuew") + else() + target_link_libraries(${target} ${CUDA_CUDA_LIBRARY}) + endif() endif() diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 4d0840ece74..66ea8400e41 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -226,8 +226,8 @@ bool EDBM_mtexpoly_check(struct BMEditMesh *em) RET_ZERO float *RE_RenderLayerGetPass(volatile struct RenderLayer *rl, int passtype, const char *viewname) RET_NULL float RE_filter_value(int type, float x) RET_ZERO struct RenderLayer *RE_GetRenderLayer(struct RenderResult *rr, const char *name) RET_NULL -void RE_init_texture_rng() RET_NONE -void RE_exit_texture_rng() RET_NONE +void RE_texture_rng_init() RET_NONE +void RE_texture_rng_exit() RET_NONE bool RE_layers_have_name(struct RenderResult *result) {STUB_ASSERT(0); return 0;} void RE_engine_active_view_set(struct RenderEngine *engine, const char *viewname) {STUB_ASSERT(0);} @@ -254,8 +254,8 @@ int multitex_ext(struct Tex *tex, float texvec[3], float dxt[3], float dyt[3], i int multitex_ext_safe(struct Tex *tex, float texvec[3], struct TexResult *texres, struct ImagePool *pool, bool scene_color_manage, const bool skip_load_image) RET_ZERO int multitex_nodes(struct Tex *tex, float texvec[3], float dxt[3], float dyt[3], int osatex, struct TexResult *texres, const short thread, short which_output, struct ShadeInput *shi, struct MTex *mtex, struct ImagePool *pool) RET_ZERO -struct Material *RE_init_sample_material(struct Material *orig_mat, struct Scene *scene) RET_NULL -void RE_free_sample_material(struct Material *mat) RET_NONE +struct Material *RE_sample_material_init(struct Material *orig_mat, struct Scene *scene) RET_NULL +void RE_sample_material_free(struct Material *mat) RET_NONE void RE_sample_material_color( struct Material *mat, float color[3], float *alpha, const float volume_co[3], const float surface_co[3], int tri_index, struct DerivedMesh *orcoDm, struct Object *ob) RET_NONE @@ -263,6 +263,8 @@ void RE_sample_material_color( struct Render *RE_GetRender(const char *name) RET_NULL struct Object *RE_GetCamera(struct Render *re) RET_NULL float RE_lamp_get_data(struct ShadeInput *shi, struct Object *lamp_obj, float col[4], float lv[3], float *dist, float shadow[4]) RET_ZERO +const float (*RE_object_instance_get_matrix(struct ObjectInstanceRen *obi, int matrix_id))[4] RET_NULL +const float (*RE_render_current_get_matrix(int matrix_id))[4] RET_NULL /* blenkernel */ bool BKE_paint_proj_mesh_data_check(struct Scene *scene, struct Object *ob, bool *uvs, bool *mat, bool *tex, bool *stencil) RET_ZERO @@ -283,7 +285,6 @@ struct Render *RE_NewRender(const char *name) RET_NULL void RE_SwapResult(struct Render *re, struct RenderResult **rr) RET_NONE void RE_BlenderFrame(struct Render *re, struct Main *bmain, struct Scene *scene, struct SceneRenderLayer *srl, struct Object *camera_override, unsigned int lay_override, int frame, const bool write_still) RET_NONE bool RE_WriteEnvmapResult(struct ReportList *reports, struct Scene *scene, struct EnvMap *env, const char *relpath, const char imtype, float layout[12]) RET_ZERO -void RE_cache_point_density(struct Scene *scene, struct PointDensity *pd, const bool use_render_params) RET_NONE /* rna */ float *ED_view3d_cursor3d_get(struct Scene *scene, struct View3D *v3d) RET_NULL @@ -630,7 +631,9 @@ void RE_engine_update_memory_stats(struct RenderEngine *engine, float mem_used, struct RenderEngine *RE_engine_create(struct RenderEngineType *type) RET_NULL void RE_engine_frame_set(struct RenderEngine *engine, int frame, float subframe) RET_NONE void RE_FreePersistentData(void) RET_NONE -void RE_sample_point_density(struct Scene *scene, struct PointDensity *pd, int resolution, const bool use_render_params, float *values) RET_NONE; +void RE_point_density_cache(struct Scene *scene, struct PointDensity *pd, const bool use_render_params) RET_NONE +void RE_point_density_minmax(struct Scene *scene, struct PointDensity *pd, const bool use_render_params, float r_min[3], float r_max[3]) RET_NONE; +void RE_point_density_sample(struct Scene *scene, struct PointDensity *pd, int resolution, const bool use_render_params, float *values) RET_NONE; void RE_instance_get_particle_info(struct ObjectInstanceRen *obi, float *index, float *age, float *lifetime, float co[3], float *size, float vel[3], float angvel[3]) RET_NONE void RE_FreeAllPersistentData(void) RET_NONE |