diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2015-09-24 18:24:20 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2015-09-24 18:24:20 +0300 |
| commit | 27b3ea622f8bd313a8e2827dfec752bf2125566c (patch) | |
| tree | f212e49d224ce8e1cfc3b17a64ae524711494391 /source/blender/render/extern/include/RE_render_ext.h | |
| parent | 372dff8d1dc7e24d4b2cd37de245588ecfce8bfa (diff) | |
| parent | de80e687689032cb85179a1f7e89750573631d5d (diff) | |
Merge remote-tracking branch 'origin/master' into cycles_camera_nodescycles_camera_nodes
Note: the branch currently crashes in blender_camera_nodes.cpp:
BL::NodeTree b_ntree = b_data.node_groups[nodes_tree_name];
The crash was introduced in:
cb7cf523e5c000609f32a382e2c0fcc57f635a42
Conflicts:
intern/cycles/SConscript
intern/cycles/blender/addon/__init__.py
intern/cycles/blender/addon/properties.py
intern/cycles/blender/blender_camera.cpp
intern/cycles/kernel/kernel_types.h
intern/cycles/kernel/svm/svm.h
intern/cycles/kernel/svm/svm_types.h
intern/cycles/render/camera.cpp
intern/cycles/render/camera.h
Diffstat (limited to 'source/blender/render/extern/include/RE_render_ext.h')
| -rw-r--r-- | source/blender/render/extern/include/RE_render_ext.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/source/blender/render/extern/include/RE_render_ext.h b/source/blender/render/extern/include/RE_render_ext.h index eb861d440d8..6e1f128b7a5 100644 --- a/source/blender/render/extern/include/RE_render_ext.h +++ b/source/blender/render/extern/include/RE_render_ext.h @@ -39,13 +39,11 @@ /* called by meshtools */ struct DerivedMesh; struct ImagePool; -struct LinkNode; struct MTex; struct Scene; -struct View3D; /* particle.c, effect.c, editmesh_modes.c and brush.c, returns 1 if rgb, 0 otherwise */ -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); +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); /* particle.c */ void texture_rgb_blend(float in[3], const float tex[3], const float out[3], float fact, float facg, int blendtype); @@ -58,8 +56,16 @@ void antialias_tagbuf(int xsize, int ysize, char *rectmove); /* dynamicpaint.c */ struct Material *RE_init_sample_material(struct Material *orig_mat, struct Scene *scene); void RE_free_sample_material(struct Material *mat); -void RE_sample_material_color(struct Material *mat, float color[3], float *alpha, const float volume_co[3], const float surface_co[3], - int face_index, short hit_quad, struct DerivedMesh *orcoDm, struct Object *ob); +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); +/* pointdensity.c */ +struct PointDensity; + +void RE_sample_point_density(struct Scene *scene, struct PointDensity *pd, int resolution, float *values); + +void RE_init_texture_rng(void); +void RE_exit_texture_rng(void); #endif /* __RE_RENDER_EXT_H__ */ |