archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Workbench: Codestyle

Browse Source
This commit is contained in:
Clément Foucault
2018-05-21 19:18:01 +02:00
parent 975eac0b07
commit c883f09fa8
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/draw/engines/workbench/workbench_deferred.c
View File

@@ -86,8 +86,6 @@ extern char datatoc_workbench_data_lib_glsl[];
extern char datatoc_workbench_object_outline_lib_glsl[]; extern char datatoc_workbench_object_outline_lib_glsl[];
extern char datatoc_workbench_world_light_lib_glsl[]; extern char datatoc_workbench_world_light_lib_glsl[];
static char *workbench_build_composite_frag(WORKBENCH_PrivateData *wpd) static char *workbench_build_composite_frag(WORKBENCH_PrivateData *wpd)
{ {
char *str = NULL; char *str = NULL;
@@ -126,8 +124,6 @@ static char *workbench_build_prepass_frag(void)
return str; return str;
} }
static void ensure_deferred_shaders(WORKBENCH_PrivateData *wpd, int index, int drawtype) static void ensure_deferred_shaders(WORKBENCH_PrivateData *wpd, int index, int drawtype)
{ {
if (e_data.prepass_sh_cache[index] == NULL) { if (e_data.prepass_sh_cache[index] == NULL) {
@@ -383,6 +379,7 @@ void workbench_deferred_cache_init(WORKBENCH_Data *vedata)
} }
} }
} }
static WORKBENCH_MaterialData *get_or_create_material_data( static WORKBENCH_MaterialData *get_or_create_material_data(
WORKBENCH_Data *vedata, Object *ob, Material *mat, Image *ima, int drawtype) WORKBENCH_Data *vedata, Object *ob, Material *mat, Image *ima, int drawtype)
{ {