diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-12-17 15:07:00 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-12-17 15:07:00 +0300 |
| commit | 3af98b4c04b33791254a4abe0a03ed65007d5e9a (patch) | |
| tree | c07a9c722b94b1cdc0648c98cefff4ea61cf6c39 /source/blenderplayer | |
| parent | 1bfe359802a105f5075e9e17c29cd832add619fd (diff) | |
| parent | 6c3d8fbeb399c394831137b511c02df642fade92 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
intern/cycles/blender/CMakeLists.txt
source/blender/editors/gpencil/drawgpencil.c
source/blender/editors/physics/physics_ops.c
Diffstat (limited to 'source/blenderplayer')
| -rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 15d230f7a0c..6b885f6d8dd 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -670,6 +670,7 @@ void RE_point_density_sample(struct Scene *scene, struct PointDensity *pd, int r void RE_point_density_free(struct PointDensity *pd) 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 +float RE_fresnel_dielectric(float incoming[3], float normal[3], float eta) RET_NONE /* python */ struct wmOperatorType *WM_operatortype_find(const char *idname, bool quiet) RET_NULL |