[Bf-blender-cvs] [1f5d51e44ec] blender2.8: Cleanup: style
Campbell Barton
noreply at git.blender.org
Thu Apr 19 07:47:27 CEST 2018
Commit: 1f5d51e44ecf99f34d8e733559a9312e5ae3ef33
Author: Campbell Barton
Date: Thu Apr 19 07:47:03 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB1f5d51e44ecf99f34d8e733559a9312e5ae3ef33
Cleanup: style
===================================================================
M source/blender/draw/engines/eevee/eevee_render.c
M source/blender/draw/engines/workbench/solid_flat_mode.c
M source/blender/draw/engines/workbench/solid_studio_mode.c
M source/blender/draw/engines/workbench/workbench_materials.c
M source/blender/draw/engines/workbench/workbench_private.h
M source/blender/draw/intern/draw_instance_data.c
M source/blender/draw/intern/draw_manager.c
M source/blender/draw/intern/draw_manager_exec.c
M source/blender/draw/intern/draw_manager_shader.c
M source/blender/draw/modes/object_mode.c
M source/blender/editors/interface/interface_icons.c
M source/blender/editors/interface/interface_widgets.c
M source/blender/editors/mesh/editmesh_extrude.c
M source/blender/editors/mesh/editmesh_tools.c
M source/blender/editors/object/object_edit.c
M source/blender/editors/space_node/drawnode.c
M source/blender/editors/space_outliner/outliner_ops.c
M source/blender/editors/space_outliner/outliner_tree.c
M source/blender/editors/space_view3d/view3d_project.c
M source/blender/editors/transform/transform_conversions.c
M source/blender/gpu/intern/gpu_batch.c
M source/blender/gpu/intern/gpu_framebuffer.c
M source/blender/gpu/intern/gpu_material.c
M source/blender/gpu/intern/gpu_texture.c
M source/blender/makesrna/intern/rna_scene_api.c
M source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.c
===================================================================
diff --git a/source/blender/draw/engines/eevee/eevee_render.c b/source/blender/draw/engines/eevee/eevee_render.c
index 08dcb626964..6d9824f7ca9 100644
--- a/source/blender/draw/engines/eevee/eevee_render.c
+++ b/source/blender/draw/engines/eevee/eevee_render.c
@@ -256,8 +256,8 @@ static void eevee_render_result_normal(
}
float fenc[2];
- fenc[0] = rp->rect[i+0] * 4.0f - 2.0f;
- fenc[1] = rp->rect[i+1] * 4.0f - 2.0f;
+ fenc[0] = rp->rect[i + 0] * 4.0f - 2.0f;
+ fenc[1] = rp->rect[i + 1] * 4.0f - 2.0f;
float f = dot_v2v2(fenc, fenc);
float g = sqrtf(1.0f - f / 4.0f);
@@ -360,7 +360,7 @@ static void eevee_render_result_occlusion(
/* This is the accumulated color. Divide by the number of samples. */
for (int i = 0; i < rp->rectx * rp->recty * 3; i += 3) {
- rp->rect[i] = rp->rect[i + 1] = rp->rect[i+2] = min_ff(1.0f, rp->rect[i] / (float)render_samples);
+ rp->rect[i] = rp->rect[i + 1] = rp->rect[i + 2] = min_ff(1.0f, rp->rect[i] / (float)render_samples);
}
}
}
@@ -483,7 +483,7 @@ void EEVEE_render_draw(EEVEE_Data *vedata, RenderEngine *engine, RenderLayer *rl
DRW_uniformbuffer_update(sldata->common_ubo, &sldata->common_data);
char info[42];
- BLI_snprintf(info, sizeof(info), "Rendering %u / %u samples", render_samples+1, tot_sample);
+ BLI_snprintf(info, sizeof(info), "Rendering %u / %u samples", render_samples + 1, tot_sample);
RE_engine_update_stats(engine, NULL, info);
/* Refresh Shadows */
diff --git a/source/blender/draw/engines/workbench/solid_flat_mode.c b/source/blender/draw/engines/workbench/solid_flat_mode.c
index 5ae46c060db..bed87518f39 100644
--- a/source/blender/draw/engines/workbench/solid_flat_mode.c
+++ b/source/blender/draw/engines/workbench/solid_flat_mode.c
@@ -71,7 +71,7 @@ static void workbench_solid_flat_cache_populate(void *vedata, Object *ob)
WORKBENCH_StorageList *stl = data->stl;
IDProperty *props = BKE_layer_collection_engine_evaluated_get(ob, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_WORKBENCH);
- const float* color = BKE_collection_engine_property_value_get_float_array(props, "object_color");
+ const float *color = BKE_collection_engine_property_value_get_float_array(props, "object_color");
if (!DRW_object_is_renderable(ob))
return;
@@ -90,7 +90,7 @@ static void workbench_solid_flat_cache_populate(void *vedata, Object *ob)
static void workbench_solid_flat_cache_finish(void *vedata)
{
- workbench_materials_cache_finish((WORKBENCH_Data*)vedata);
+ workbench_materials_cache_finish((WORKBENCH_Data *)vedata);
}
static void workbench_solid_flat_draw_scene(void *vedata)
diff --git a/source/blender/draw/engines/workbench/solid_studio_mode.c b/source/blender/draw/engines/workbench/solid_studio_mode.c
index e8664bda740..6ac63fbca67 100644
--- a/source/blender/draw/engines/workbench/solid_studio_mode.c
+++ b/source/blender/draw/engines/workbench/solid_studio_mode.c
@@ -90,7 +90,7 @@ static void workbench_solid_studio_cache_populate(void *vedata, Object *ob)
static void workbench_solid_studio_cache_finish(void *vedata)
{
- workbench_materials_cache_finish((WORKBENCH_Data*)vedata);
+ workbench_materials_cache_finish((WORKBENCH_Data *)vedata);
}
static void workbench_solid_studio_draw_scene(void *vedata)
diff --git a/source/blender/draw/engines/workbench/workbench_materials.c b/source/blender/draw/engines/workbench/workbench_materials.c
index e9337761231..873d24116a1 100644
--- a/source/blender/draw/engines/workbench/workbench_materials.c
+++ b/source/blender/draw/engines/workbench/workbench_materials.c
@@ -22,7 +22,7 @@
/** \file workbench_materials.c
* \ingroup draw_engine
*/
-
+
#include "workbench_private.h"
#include "GPU_shader.h"
@@ -32,7 +32,7 @@ static struct {
/* Solid flat mode */
struct GPUShader *solid_flat_sh;
-
+
/* Solid studio mode */
struct GPUShader *solid_studio_sh;
@@ -46,22 +46,24 @@ extern char datatoc_workbench_studio_vert_glsl[];
extern char datatoc_workbench_diffuse_lib_glsl[];
/* Functions */
-static uint get_material_hash(const float color[3]) {
+static uint get_material_hash(const float color[3])
+{
uint r = (uint)(color[0] * 512);
uint g = (uint)(color[1] * 512);
uint b = (uint)(color[2] * 512);
-
+
return r + g * 4096 + b * 4096 * 4096;
}
-WORKBENCH_MaterialData* workbench_get_or_create_solid_flat_material_data(WORKBENCH_Data *vedata, const float color[3]) {
+WORKBENCH_MaterialData *workbench_get_or_create_solid_flat_material_data(WORKBENCH_Data *vedata, const float color[3])
+{
WORKBENCH_StorageList *stl = vedata->stl;
WORKBENCH_PassList *psl = vedata->psl;
- WORKBENCH_PrivateData* wpd = stl->g_data;
-
+ WORKBENCH_PrivateData *wpd = stl->g_data;
+
uint hash = get_material_hash(color);
WORKBENCH_MaterialData *material;
-
+
material = BLI_ghash_lookup(wpd->material_hash, SET_UINT_IN_POINTER(hash));
if (material == NULL) {
material = MEM_mallocN(sizeof(WORKBENCH_MaterialData), "WORKBENCH_MaterialData");
@@ -75,14 +77,15 @@ WORKBENCH_MaterialData* workbench_get_or_create_solid_flat_material_data(WORKBEN
return material;
}
-WORKBENCH_MaterialData* workbench_get_or_create_solid_studio_material_data(WORKBENCH_Data *vedata, const float color[3]) {
+WORKBENCH_MaterialData *workbench_get_or_create_solid_studio_material_data(WORKBENCH_Data *vedata, const float color[3])
+{
WORKBENCH_StorageList *stl = vedata->stl;
WORKBENCH_PassList *psl = vedata->psl;
- WORKBENCH_PrivateData* wpd = stl->g_data;
-
+ WORKBENCH_PrivateData *wpd = stl->g_data;
+
uint hash = get_material_hash(color);
WORKBENCH_MaterialData *material;
-
+
material = BLI_ghash_lookup(wpd->material_hash, SET_UINT_IN_POINTER(hash));
if (material == NULL) {
material = MEM_mallocN(sizeof(WORKBENCH_MaterialData), "WORKBENCH_MaterialData");
@@ -96,7 +99,8 @@ WORKBENCH_MaterialData* workbench_get_or_create_solid_studio_material_data(WORKB
return material;
}
-void workbench_materials_engine_init(void) {
+void workbench_materials_engine_init(void)
+{
if (!e_data.depth_sh) {
/* Depth pass */
e_data.depth_sh = DRW_shader_create_3D_depth_only();
@@ -107,22 +111,25 @@ void workbench_materials_engine_init(void) {
}
}
-void workbench_materials_engine_finish(void) {
+void workbench_materials_engine_finish(void)
+{
DRW_SHADER_FREE_SAFE(e_data.solid_flat_sh);
DRW_SHADER_FREE_SAFE(e_data.solid_studio_sh);
}
-void workbench_materials_cache_init(WORKBENCH_Data *vedata) {
- WORKBENCH_StorageList* stl = vedata->stl;
- WORKBENCH_PassList* psl = vedata->psl;
- WORKBENCH_PrivateData* wpd = stl->g_data;
-
+void workbench_materials_cache_init(WORKBENCH_Data *vedata)
+{
+ WORKBENCH_StorageList *stl = vedata->stl;
+ WORKBENCH_PassList *psl = vedata->psl;
+ WORKBENCH_PrivateData *wpd = stl->g_data;
+
wpd->depth_shgrp = DRW_shgroup_create(e_data.depth_sh, psl->depth_pass);
wpd->material_hash = BLI_ghash_ptr_new("Workbench material_hash");
}
-void workbench_materials_cache_finish(WORKBENCH_Data *vedata) {
- WORKBENCH_StorageList* stl = vedata->stl;
- WORKBENCH_PrivateData* wpd = stl->g_data;
+void workbench_materials_cache_finish(WORKBENCH_Data *vedata)
+{
+ WORKBENCH_StorageList *stl = vedata->stl;
+ WORKBENCH_PrivateData *wpd = stl->g_data;
BLI_ghash_free(wpd->material_hash, NULL, MEM_freeN);
}
diff --git a/source/blender/draw/engines/workbench/workbench_private.h b/source/blender/draw/engines/workbench/workbench_private.h
index d96565b6864..e45ee9bd043 100644
--- a/source/blender/draw/engines/workbench/workbench_private.h
+++ b/source/blender/draw/engines/workbench/workbench_private.h
@@ -62,24 +62,24 @@ typedef struct WORKBENCH_MaterialData {
float color[3];
/* Linked shgroup for drawing */
- DRWShadingGroup * shgrp;
+ DRWShadingGroup *shgrp;
} WORKBENCH_MaterialData;
/* workbench_engine.c */
void workbench_solid_materials_init(void);
-void workbench_solid_materials_cache_init(WORKBENCH_Data* vedata);
-void workbench_solid_materials_cache_populate(WORKBENCH_Data* vedata, Object* ob);
-void workbench_solid_materials_cache_finish(WORKBENCH_Data* vedata);
-void workbench_solid_materials_draw_scene(WORKBENCH_Data* vedata);
+void workbench_solid_materials_cache_init(WORKBENCH_Data *vedata);
+void workbench_solid_materials_cache_populate(WORKBENCH_Data *vedata, Object *ob);
+void workbench_solid_materials_cache_finish(WORKBENCH_Data *vedata);
+void workbench_solid_materials_draw_scene(WORKBENCH_Data *vedata);
void workbench_solid_materials_free(void);
/* workbench_materials.c */
void workbench_materials_engine_init(void);
void workbench_materials_engine_finish(void);
void workbench_materials_cache_init(WORKBENCH_Data *vedata);
-WORKBENCH_MaterialData* workbench_get_or_create_solid_flat_material_data(WORKBENCH_Data *vedata, const float color[3]);
-WORKBENCH_MaterialData* workbench_get_or_create_solid_studio_material_data(WORKBENCH_Data *vedata, const float color[3]);
+WORKBENCH_MaterialData *workbench_get_or_create_solid_flat_material_data(WORKBENCH_Data *vedata, const float color[3]);
+WORKBENCH_MaterialData *workbench_get_or_create_solid_studio_material_data(WORKBENCH_Data *vedata, const float color[3]);
void workbench_materials_cache_finish(WORKBENCH_Data *vedata);
diff --git a/source/blender/draw/intern/draw_instance_data.c b/source/blender/draw/intern/draw_instance_data.c
index ee73a2ba2c6..350d4a0c20d 100644
--- a/source/blender/draw/intern/draw_instance_data.c
+++ b/source/blender/draw/intern/draw_instance_data.c
@@ -297,13 +297,13 @@ static DRWInstanceData *drw_instance_data_create(
BLI_assert(attrib_size > 0);
/* Push to linked list. */
- if (idatalist->idata_head[attrib_size-1] == NULL) {
- idatalist->idata_head[attrib_size-1] = idata;
+ if (idatalist->idata_head[attrib_size - 1] == NULL) {
+ idatalist->idata_head[attrib_size - 1] = idata;
}
else {
- idatalist->idata_tail[attrib_size-1]->next = idata;
+ idatalist->idata_tail[attrib_size - 1]->next = idata;
}
- idatalist->idata_tail[attrib_size-1] = idata;
+ idatalist->idata_tail[attrib_size - 1] = idata;
return idata;
}
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 66de79314b4..c99cd25df67 100644
--- a/source/blender/
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list