diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-11-09 17:42:38 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-11-09 18:19:49 +0300 |
commit | 880b0f981dce558d0661c1b838753fb7a07945c1 (patch) | |
tree | 84860cc0ae2b49d0c3f4a85ee7367408eb34313e | |
parent | 4f66cf3b8bb02f2c7c7c235ad7039ba1aa43212a (diff) |
Cleanup: more renaming in the render/ module for consistency
45 files changed, 91 insertions, 138 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 71c859e1514..f4f25c3a153 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -58,7 +58,7 @@ #include "DEG_depsgraph.h" #include "RE_pipeline.h" -#include "RE_render_ext.h" +#include "RE_texture.h" #include "SEQ_sequencer.h" diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 806b9ca1416..1b77989c2b8 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -50,7 +50,7 @@ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "RE_render_ext.h" /* RE_texture_evaluate */ +#include "RE_texture.h" /* RE_texture_evaluate */ #include "BLO_read_write.h" diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 95408c7d01f..b56a15b3d45 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -76,9 +76,7 @@ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -/* to read material/texture color */ -#include "RE_render_ext.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" #include "atomic_ops.h" diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index f9d3fff1cec..13e9bb1bf24 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -68,8 +68,7 @@ #include "DEG_depsgraph_physics.h" #include "DEG_depsgraph_query.h" -#include "RE_render_ext.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" EffectorWeights *BKE_effector_add_weights(Collection *collection) { diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c index 097d198565e..eb1d77eb0f4 100644 --- a/source/blender/blenkernel/intern/fluid.c +++ b/source/blender/blenkernel/intern/fluid.c @@ -80,7 +80,7 @@ # include "DEG_depsgraph.h" # include "DEG_depsgraph_query.h" -# include "RE_shader_ext.h" +# include "RE_texture.h" # include "CLG_log.h" diff --git a/source/blender/blenkernel/intern/ocean.c b/source/blender/blenkernel/intern/ocean.c index 6c770e53000..1d62a1cce2a 100644 --- a/source/blender/blenkernel/intern/ocean.c +++ b/source/blender/blenkernel/intern/ocean.c @@ -47,7 +47,7 @@ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "RE_render_ext.h" +#include "RE_texture.h" #include "BLI_hash.h" diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 222325727c1..0b331fb88d2 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -83,7 +83,7 @@ #include "DEG_depsgraph_build.h" #include "DEG_depsgraph_query.h" -#include "RE_render_ext.h" +#include "RE_texture.h" #include "BLO_read_write.h" diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 91bdfaeae95..4117dfc0b23 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -83,7 +83,7 @@ #include "PIL_time.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" /* FLUID sim particle import */ #ifdef WITH_FLUID diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index a77e0ed2b7d..4c2e4a82acb 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -67,7 +67,7 @@ #include "BKE_scene.h" #include "BKE_texture.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" #include "BLO_read_write.h" diff --git a/source/blender/compositor/operations/COM_AntiAliasOperation.cpp b/source/blender/compositor/operations/COM_AntiAliasOperation.cpp index b0d63d7b791..684485c40cb 100644 --- a/source/blender/compositor/operations/COM_AntiAliasOperation.cpp +++ b/source/blender/compositor/operations/COM_AntiAliasOperation.cpp @@ -22,7 +22,7 @@ #include "MEM_guardedalloc.h" -#include "RE_render_ext.h" +#include "RE_texture.h" /* An implementation of the Scale3X edge-extrapolation algorithm. * diff --git a/source/blender/compositor/operations/COM_CompositorOperation.cpp b/source/blender/compositor/operations/COM_CompositorOperation.cpp index 3ec54b1c04d..6a16872cae2 100644 --- a/source/blender/compositor/operations/COM_CompositorOperation.cpp +++ b/source/blender/compositor/operations/COM_CompositorOperation.cpp @@ -25,8 +25,7 @@ #include "BLI_threads.h" #include "RE_pipeline.h" -#include "RE_render_ext.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" #include "render_types.h" diff --git a/source/blender/compositor/operations/COM_ImageOperation.cpp b/source/blender/compositor/operations/COM_ImageOperation.cpp index f8fe4eb883c..ae5b7293a8c 100644 --- a/source/blender/compositor/operations/COM_ImageOperation.cpp +++ b/source/blender/compositor/operations/COM_ImageOperation.cpp @@ -27,9 +27,9 @@ #include "IMB_colormanagement.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" + #include "RE_pipeline.h" -#include "RE_render_ext.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" BaseImageOperation::BaseImageOperation() { diff --git a/source/blender/compositor/operations/COM_ImageOperation.h b/source/blender/compositor/operations/COM_ImageOperation.h index fcffdc7aae9..bff8dcc1cea 100644 --- a/source/blender/compositor/operations/COM_ImageOperation.h +++ b/source/blender/compositor/operations/COM_ImageOperation.h @@ -25,8 +25,7 @@ #include "MEM_guardedalloc.h" #include "RE_pipeline.h" -#include "RE_render_ext.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" /** * \brief Base class for all image operations diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.cpp b/source/blender/compositor/operations/COM_RenderLayersProg.cpp index 40a68d4f9e2..11f64aa4d6a 100644 --- a/source/blender/compositor/operations/COM_RenderLayersProg.cpp +++ b/source/blender/compositor/operations/COM_RenderLayersProg.cpp @@ -23,8 +23,7 @@ #include "DNA_scene_types.h" #include "RE_pipeline.h" -#include "RE_render_ext.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" /* ******** Render Layers Base Prog ******** */ diff --git a/source/blender/compositor/operations/COM_TextureOperation.h b/source/blender/compositor/operations/COM_TextureOperation.h index 7fa85922b0b..a40dafd14cf 100644 --- a/source/blender/compositor/operations/COM_TextureOperation.h +++ b/source/blender/compositor/operations/COM_TextureOperation.h @@ -24,8 +24,7 @@ #include "MEM_guardedalloc.h" #include "RE_pipeline.h" -#include "RE_render_ext.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" /** * Base class for all renderlayeroperations diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index c8367c720a7..b961f81e16a 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -75,7 +75,7 @@ #include "ED_uvedit.h" #include "ED_view3d.h" -#include "RE_render_ext.h" +#include "RE_texture.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c index bb8597bf02c..008498a1735 100644 --- a/source/blender/editors/object/object_bake.c +++ b/source/blender/editors/object/object_bake.c @@ -53,7 +53,7 @@ #include "RE_multires_bake.h" #include "RE_pipeline.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" #include "PIL_time.h" diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index 4afa45893f9..095deccada0 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -86,7 +86,7 @@ #include "RE_engine.h" #include "RE_pipeline.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c index fa79bd8ee93..6139adaea1a 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.c +++ b/source/blender/editors/sculpt_paint/paint_utils.c @@ -64,7 +64,7 @@ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "RE_render_ext.h" +#include "RE_texture.h" #include "ED_screen.h" #include "ED_view3d.h" diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 6ac3f1dd424..e91b0d860c6 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -55,7 +55,7 @@ #include "MEM_guardedalloc.h" -#include "RE_render_ext.h" +#include "RE_texture.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/makesrna/intern/rna_texture_api.c b/source/blender/makesrna/intern/rna_texture_api.c index b000565ed09..13b561f9dd6 100644 --- a/source/blender/makesrna/intern/rna_texture_api.c +++ b/source/blender/makesrna/intern/rna_texture_api.c @@ -36,7 +36,7 @@ # include "IMB_imbuf.h" # include "IMB_imbuf_types.h" # include "RE_pipeline.h" -# include "RE_shader_ext.h" +# include "RE_texture.h" static void texture_evaluate(struct Tex *tex, float value[3], float r_color[4]) { diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c index efd46f53eb6..d432559fcfa 100644 --- a/source/blender/modifiers/intern/MOD_displace.c +++ b/source/blender/modifiers/intern/MOD_displace.c @@ -61,7 +61,7 @@ #include "MOD_ui_common.h" #include "MOD_util.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" /* Displace */ diff --git a/source/blender/modifiers/intern/MOD_volume_displace.cc b/source/blender/modifiers/intern/MOD_volume_displace.cc index 1b1d4187899..f4e1936713c 100644 --- a/source/blender/modifiers/intern/MOD_volume_displace.cc +++ b/source/blender/modifiers/intern/MOD_volume_displace.cc @@ -45,7 +45,7 @@ #include "MOD_modifiertypes.h" #include "MOD_ui_common.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" #include "RNA_access.h" diff --git a/source/blender/modifiers/intern/MOD_warp.c b/source/blender/modifiers/intern/MOD_warp.c index 4d1e2cea86f..53e41484606 100644 --- a/source/blender/modifiers/intern/MOD_warp.c +++ b/source/blender/modifiers/intern/MOD_warp.c @@ -57,7 +57,7 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" #include "MOD_ui_common.h" #include "MOD_util.h" diff --git a/source/blender/modifiers/intern/MOD_wave.c b/source/blender/modifiers/intern/MOD_wave.c index 4c8b511f19a..45f06a7778c 100644 --- a/source/blender/modifiers/intern/MOD_wave.c +++ b/source/blender/modifiers/intern/MOD_wave.c @@ -51,7 +51,8 @@ #include "RNA_access.h" #include "MEM_guardedalloc.h" -#include "RE_shader_ext.h" + +#include "RE_texture.h" #include "MOD_modifiertypes.h" #include "MOD_ui_common.h" diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.c b/source/blender/modifiers/intern/MOD_weightvg_util.c index 1c1ca08183d..c5e2ecb9660 100644 --- a/source/blender/modifiers/intern/MOD_weightvg_util.c +++ b/source/blender/modifiers/intern/MOD_weightvg_util.c @@ -55,7 +55,7 @@ #include "MOD_ui_common.h" #include "MOD_util.h" #include "MOD_weightvg_util.h" -#include "RE_shader_ext.h" /* Texture masking. */ +#include "RE_texture.h" /* Texture masking. */ /* Maps new_w weights in place, using either one of the predefined functions, or a custom curve. * Return values are in new_w. diff --git a/source/blender/nodes/shader/node_shader_tree.c b/source/blender/nodes/shader/node_shader_tree.c index ae5da4d2fd2..efd0e48f41a 100644 --- a/source/blender/nodes/shader/node_shader_tree.c +++ b/source/blender/nodes/shader/node_shader_tree.c @@ -50,7 +50,7 @@ #include "GPU_material.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" #include "NOD_common.h" diff --git a/source/blender/nodes/shader/node_shader_util.h b/source/blender/nodes/shader/node_shader_util.h index c1687e1a349..91454c3c982 100644 --- a/source/blender/nodes/shader/node_shader_util.h +++ b/source/blender/nodes/shader/node_shader_util.h @@ -63,7 +63,7 @@ #include "IMB_colormanagement.h" #include "RE_pipeline.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" #include "GPU_material.h" #include "GPU_texture.h" diff --git a/source/blender/nodes/shader/nodes/node_shader_particle_info.c b/source/blender/nodes/shader/nodes/node_shader_particle_info.c index b646e806e6e..c6eabc3b2cb 100644 --- a/source/blender/nodes/shader/nodes/node_shader_particle_info.c +++ b/source/blender/nodes/shader/nodes/node_shader_particle_info.c @@ -18,7 +18,7 @@ */ #include "../node_shader_util.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" static bNodeSocketTemplate outputs[] = { {SOCK_FLOAT, "Index"}, diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.c b/source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.c index fae1fb283ed..14cd1fd4c0c 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.c +++ b/source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.c @@ -19,7 +19,7 @@ #include "../node_shader_util.h" -#include "RE_render_ext.h" +#include "RE_texture.h" /* **************** OUTPUT ******************** */ diff --git a/source/blender/nodes/texture/node_texture_tree.c b/source/blender/nodes/texture/node_texture_tree.c index 2d593c6218a..48027dc847b 100644 --- a/source/blender/nodes/texture/node_texture_tree.c +++ b/source/blender/nodes/texture/node_texture_tree.c @@ -48,7 +48,7 @@ #include "RNA_access.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" static void texture_get_from_context(const bContext *C, bNodeTreeType *UNUSED(treetype), diff --git a/source/blender/nodes/texture/node_texture_util.h b/source/blender/nodes/texture/node_texture_util.h index 01d1aa5cd62..74f27ef3974 100644 --- a/source/blender/nodes/texture/node_texture_util.h +++ b/source/blender/nodes/texture/node_texture_util.h @@ -61,7 +61,7 @@ #include "IMB_imbuf_types.h" #include "RE_pipeline.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/nodes/texture/nodes/node_texture_proc.c b/source/blender/nodes/texture/nodes/node_texture_proc.c index 2cd4e31feb3..a8a82153e58 100644 --- a/source/blender/nodes/texture/nodes/node_texture_proc.c +++ b/source/blender/nodes/texture/nodes/node_texture_proc.c @@ -24,7 +24,7 @@ #include "NOD_texture.h" #include "node_texture_util.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" /* * In this file: wrappers to use procedural textures as nodes diff --git a/source/blender/nodes/texture/nodes/node_texture_texture.c b/source/blender/nodes/texture/nodes/node_texture_texture.c index 9551a10ee57..59e2e9be581 100644 --- a/source/blender/nodes/texture/nodes/node_texture_texture.c +++ b/source/blender/nodes/texture/nodes/node_texture_texture.c @@ -24,7 +24,7 @@ #include "NOD_texture.h" #include "node_texture_util.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" static bNodeSocketTemplate inputs[] = { {SOCK_RGBA, N_("Color1"), 1.0f, 1.0f, 1.0f, 1.0f}, diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index 6e229fd25b7..2516c015924 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -42,8 +42,8 @@ set(INC set(SRC - intern/bake_api.c - intern/external_engine.c + intern/bake.c + intern/engine.c intern/initrender.c intern/multires_bake.c intern/pipeline.c @@ -57,8 +57,7 @@ set(SRC RE_engine.h RE_multires_bake.h RE_pipeline.h - RE_render_ext.h - RE_shader_ext.h + RE_texture.h intern/initrender.h intern/render_result.h diff --git a/source/blender/render/RE_shader_ext.h b/source/blender/render/RE_shader_ext.h deleted file mode 100644 index d9d5a924949..00000000000 --- a/source/blender/render/RE_shader_ext.h +++ /dev/null @@ -1,83 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * The Original Code is Copyright (C) 2006 by Blender Foundation - * All rights reserved. - */ -/** \file - * \ingroup render - */ - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -/* this include is for texture exports */ -/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - -/* localized texture result data */ -/* note; tr tg tb ta has to remain in this order */ -typedef struct TexResult { - float tin, tr, tg, tb, ta; - int talpha; - float *nor; -} TexResult; - -typedef struct BakeImBufuserData { - float *displacement_buffer; - char *mask_buffer; -} BakeImBufuserData; - -/* node shaders... */ -struct ImagePool; -struct MTex; -struct Tex; - -/* this one uses nodes */ -int multitex_ext(struct Tex *tex, - float texvec[3], - float dxt[3], - float dyt[3], - int osatex, - struct TexResult *texres, - const short thread, - struct ImagePool *pool, - bool scene_color_manage, - const bool skip_load_image); -/* nodes disabled */ -int multitex_ext_safe(struct Tex *tex, - const float texvec[3], - struct TexResult *texres, - struct ImagePool *pool, - bool scene_color_manage, - const bool skip_load_image); -/* only for internal node usage */ -int multitex_nodes(struct Tex *tex, - const float texvec[3], - float dxt[3], - float dyt[3], - int osatex, - struct TexResult *texres, - const short thread, - short which_output, - struct MTex *mtex, - struct ImagePool *pool); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/render/RE_render_ext.h b/source/blender/render/RE_texture.h index 28a22399892..b394cfeee75 100644 --- a/source/blender/render/RE_render_ext.h +++ b/source/blender/render/RE_texture.h @@ -30,6 +30,7 @@ struct Depsgraph; struct ImagePool; struct MTex; +struct Tex; #ifdef __cplusplus extern "C" { @@ -75,6 +76,46 @@ void RE_point_density_free(struct PointDensity *pd); void RE_point_density_fix_linking(void); +/* texture_procedural.c */ + +/* Texture evaluation result. + * Note; tr tg tb ta has to remain in this order for array access. */ +typedef struct TexResult { + float tin, tr, tg, tb, ta; + int talpha; + float *nor; +} TexResult; + +/* This one uses nodes. */ +int multitex_ext(struct Tex *tex, + float texvec[3], + float dxt[3], + float dyt[3], + int osatex, + struct TexResult *texres, + const short thread, + struct ImagePool *pool, + bool scene_color_manage, + const bool skip_load_image); +/* Nodes disabled. */ +int multitex_ext_safe(struct Tex *tex, + const float texvec[3], + struct TexResult *texres, + struct ImagePool *pool, + bool scene_color_manage, + const bool skip_load_image); +/* Only for internal node usage. */ +int multitex_nodes(struct Tex *tex, + const float texvec[3], + float dxt[3], + float dyt[3], + int osatex, + struct TexResult *texres, + const short thread, + short which_output, + struct MTex *mtex, + struct ImagePool *pool); + #ifdef __cplusplus } #endif diff --git a/source/blender/render/intern/bake_api.c b/source/blender/render/intern/bake.c index 6f5db4986f2..6f5db4986f2 100644 --- a/source/blender/render/intern/bake_api.c +++ b/source/blender/render/intern/bake.c diff --git a/source/blender/render/intern/external_engine.c b/source/blender/render/intern/engine.c index 9a3dc0d000c..9a3dc0d000c 100644 --- a/source/blender/render/intern/external_engine.c +++ b/source/blender/render/intern/engine.c diff --git a/source/blender/render/intern/multires_bake.c b/source/blender/render/intern/multires_bake.c index ea18f151e1e..a4f68419c67 100644 --- a/source/blender/render/intern/multires_bake.c +++ b/source/blender/render/intern/multires_bake.c @@ -46,7 +46,7 @@ #include "RE_multires_bake.h" #include "RE_pipeline.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" @@ -111,6 +111,11 @@ typedef struct { const int *orig_index_mp_to_orig; } MNormalBakeData; +typedef struct BakeImBufuserData { + float *displacement_buffer; + char *mask_buffer; +} BakeImBufuserData; + static void multiresbake_get_normal(const MResolvePixelData *data, float norm[], const int tri_num, diff --git a/source/blender/render/intern/pipeline.c b/source/blender/render/intern/pipeline.c index 1bc6a056cda..3d19e5e6c15 100644 --- a/source/blender/render/intern/pipeline.c +++ b/source/blender/render/intern/pipeline.c @@ -86,7 +86,7 @@ #include "RE_engine.h" #include "RE_pipeline.h" -#include "RE_render_ext.h" +#include "RE_texture.h" #include "SEQ_sequencer.h" diff --git a/source/blender/render/intern/texture_image.c b/source/blender/render/intern/texture_image.c index 26d9f12c91e..cd34226920d 100644 --- a/source/blender/render/intern/texture_image.c +++ b/source/blender/render/intern/texture_image.c @@ -46,8 +46,7 @@ #include "BKE_image.h" -#include "RE_render_ext.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" #include "render_types.h" #include "texture_common.h" diff --git a/source/blender/render/intern/texture_pointdensity.c b/source/blender/render/intern/texture_pointdensity.c index 0e62eea5b11..e2568e0a013 100644 --- a/source/blender/render/intern/texture_pointdensity.c +++ b/source/blender/render/intern/texture_pointdensity.c @@ -56,8 +56,7 @@ #include "render_types.h" #include "texture_common.h" -#include "RE_render_ext.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" static ThreadMutex sample_mutex = PTHREAD_MUTEX_INITIALIZER; diff --git a/source/blender/render/intern/texture_procedural.c b/source/blender/render/intern/texture_procedural.c index 7f93addb76d..a98f29a705d 100644 --- a/source/blender/render/intern/texture_procedural.c +++ b/source/blender/render/intern/texture_procedural.c @@ -57,8 +57,7 @@ #include "render_types.h" #include "texture_common.h" -#include "RE_render_ext.h" -#include "RE_shader_ext.h" +#include "RE_texture.h" static RNG_THREAD_ARRAY *random_tex_array; diff --git a/source/creator/creator.c b/source/creator/creator.c index fee97e5090f..fbc97028d35 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -72,7 +72,7 @@ #include "IMB_imbuf.h" /* For #IMB_init. */ #include "RE_engine.h" -#include "RE_render_ext.h" +#include "RE_texture.h" #include "ED_datafiles.h" |