[Bf-blender-cvs] [c3ace7950dc] blender2.8: Merge branch 'master' into blender2.8

Bastien Montagne noreply at git.blender.org
Fri Feb 16 12:40:28 CET 2018


Commit: c3ace7950dca128279522858f20cc19dcbc15ed0
Author: Bastien Montagne
Date:   Fri Feb 16 11:51:41 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBc3ace7950dca128279522858f20cc19dcbc15ed0

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blenderplayer/bad_level_call_stubs/stubs.c
index 5f6b07ec956,9728511e2cf..4960a9e68d2
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@@ -766,23 -677,14 +766,23 @@@ void RE_engine_update_memory_stats(stru
  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_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_point_density_cache(struct Scene *scene, struct ViewLayer *view_layer, struct PointDensity *pd, const bool use_render_params) RET_NONE
 +void RE_point_density_minmax(struct Scene *scene, struct ViewLayer *view_layer, 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 ViewLayer *view_layer, struct PointDensity *pd, const int resolution, const bool use_render_params, float *values) RET_NONE
  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_instance_get_particle_info(struct ObjectInstanceRen *obi, float *index, float *random, 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_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_NONE
 +void RE_engine_register_pass(struct RenderEngine *engine, struct Scene *scene, struct ViewLayer *view_layer, const char *name, int channels, const char *chanid, int type) RET_NONE
 +struct ViewLayer *RE_engine_get_view_layer(struct Render *re) RET_NULL
 +void RE_SetDepsgraph(struct Render *re, struct Depsgraph *graph) RET_NONE
 +
 +/* Draw */
 +void OBJECT_collection_settings_create(struct IDProperty *properties) RET_NONE
 +void EDIT_MESH_collection_settings_create(struct IDProperty *properties) RET_NONE
 +void EDIT_ARMATURE_collection_settings_create(struct IDProperty *properties) RET_NONE
 +void PAINT_WEIGHT_collection_settings_create(struct IDProperty *properties) RET_NONE
 +void PAINT_VERTEX_collection_settings_create(struct IDProperty *properties) RET_NONE
  
  /* python */
  struct wmOperatorType *WM_operatortype_find(const char *idname, bool quiet) RET_NULL



More information about the Bf-blender-cvs mailing list