griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton
2019-04-09 08:44:06 +02:00
parent 86a44d2b07
commit eb9237eb20
9 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_modifier.h
View File

@@ -409,7 +409,7 @@ const char *modifier_path_relbase_from_global(struct Object *ob);
* If the modifier data is already original, return it as-is. */
struct ModifierData *modifier_get_original(struct ModifierData *md);
struct ModifierData *modifier_get_evaluated(
struct Depsgraph* depsgraph,
struct Depsgraph *depsgraph,
struct Object *object,
struct ModifierData *md);

2
source/blender/blenkernel/intern/modifier.c
View File

@@ -895,7 +895,7 @@ ModifierData *modifier_get_original(ModifierData *md)
}
struct ModifierData *modifier_get_evaluated(
Depsgraph* depsgraph,
Depsgraph *depsgraph,
Object *object,
ModifierData *md)
{

2
source/blender/draw/engines/gpencil/gpencil_engine.c
View File

@@ -642,7 +642,7 @@ void GPENCIL_cache_populate(void *vedata, Object *ob)
bGPdata *gpd_orig = (bGPdata *)DEG_get_original_id(&gpd->id);
if ((draw_ctx->obact == ob) &&
((gpd_orig->runtime.ar == NULL) || (gpd_orig->runtime.ar == draw_ctx->ar)))
((gpd_orig->runtime.ar == NULL) || (gpd_orig->runtime.ar == draw_ctx->ar)))
{
DRW_gpencil_populate_buffer_strokes(&e_data, vedata, ts, ob);
}

4
source/blender/draw/intern/draw_armature.c
View File

@@ -1246,8 +1246,8 @@ static void draw_points(
Bone *bone = pchan->bone;
if (is_envelope_draw) {
drw_shgroup_bone_envelope(
pchan->disp_mat, col_solid_root, col_hint_root, col_wire_root,
&bone->rad_head, &envelope_ignore, sh_cfg);
pchan->disp_mat, col_solid_root, col_hint_root, col_wire_root,
&bone->rad_head, &envelope_ignore, sh_cfg);
}
else {
drw_shgroup_bone_point(pchan->disp_mat, col_solid_root, col_hint_root, col_wire_root, sh_cfg);

4
source/blender/draw/intern/draw_cache_impl_displist.c
View File

@@ -598,9 +598,9 @@ static void set_edge_adjacency_lines_indices(EdgeHash *eh, GPUIndexBufBuilder *e
static void set_edges_adjacency_lines_indices(void *thunk, uint v1, uint v2, uint v3)
{
void **packed = (void **)thunk;
GPUIndexBufBuilder *elb = (GPUIndexBufBuilder*)packed[0];
GPUIndexBufBuilder *elb = (GPUIndexBufBuilder *)packed[0];
EdgeHash *eh = (EdgeHash *)packed[1];
bool *r_is_manifold = (bool*)packed[2];
bool *r_is_manifold = (bool *)packed[2];
set_edge_adjacency_lines_indices(eh, elb, r_is_manifold, v1, v2, v3);
set_edge_adjacency_lines_indices(eh, elb, r_is_manifold, v2, v3, v1);

2
source/blender/editors/interface/interface_region_popover.c
View File

@@ -182,7 +182,7 @@ static uiBlock *ui_block_func_POPOVER(bContext *C, uiPopupBlockHandle *handle, v
}
/* Prefer popover from header to be positioned into the editor. */
else if (sa && ar) {
if (ar->regiontype == RGN_TYPE_HEADER){
if (ar->regiontype == RGN_TYPE_HEADER) {
if (ED_area_header_alignment(sa) == RGN_ALIGN_BOTTOM) {
UI_block_direction_set(block, UI_DIR_UP | UI_DIR_CENTER_X);
}

4
source/blender/editors/screen/area.c
View File

@@ -1913,7 +1913,7 @@ void ED_area_newspace(bContext *C, ScrArea *sa, int type, const bool skip_ar_exi
/* Sync header alignment. */
if (sync_header_alignment) {
/* Spaces with footer. */
if (st->spaceid == SPACE_TEXT){
if (st->spaceid == SPACE_TEXT) {
for (ARegion *ar = sa->regionbase.first; ar; ar = ar->next) {
if (ar->regiontype == RGN_TYPE_HEADER) {
ar->alignment = header_alignment;
@@ -2573,7 +2573,7 @@ int ED_area_footer_alignment_or_fallback(const ScrArea *area, int fallback)
int ED_area_footer_alignment(const ScrArea *area)
{
return ED_area_footer_alignment_or_fallback(
area, (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_TOP : RGN_ALIGN_BOTTOM);
area, (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_TOP : RGN_ALIGN_BOTTOM);
}
/**

6
source/blender/editors/screen/screen_edit.c
View File

@@ -1263,8 +1263,10 @@ ScrArea *ED_screen_state_toggle(bContext *C, wmWindow *win, ScrArea *sa, const s
for (ar = newa->regionbase.first; ar; ar = ar->next) {
ar->flagfullscreen = ar->flag;
if (ELEM(ar->regiontype, RGN_TYPE_UI, RGN_TYPE_HEADER, RGN_TYPE_FOOTER,
RGN_TYPE_TOOLS, RGN_TYPE_NAV_BAR, RGN_TYPE_EXECUTE)) {
if (ELEM(ar->regiontype,
RGN_TYPE_UI, RGN_TYPE_HEADER, RGN_TYPE_FOOTER,
RGN_TYPE_TOOLS, RGN_TYPE_NAV_BAR, RGN_TYPE_EXECUTE))
{
ar->flag |= RGN_FLAG_HIDDEN;
}
}

6
source/blender/makesrna/intern/rna_space.c
View File

@@ -663,8 +663,10 @@ static void rna_3DViewShading_type_update(Main *bmain, Scene *scene, PointerRNA
View3DShading *shading = ptr->data;
if (shading->type == OB_MATERIAL ||
(shading->type == OB_RENDER && (strcmp(scene->r.engine, RE_engine_id_BLENDER_EEVEE) == 0 ||
strcmp(scene->r.engine, RE_engine_id_CYCLES) == 0))) {
(shading->type == OB_RENDER &&
(strcmp(scene->r.engine, RE_engine_id_BLENDER_EEVEE) == 0 ||
strcmp(scene->r.engine, RE_engine_id_CYCLES) == 0)))
{
/* When switching from workbench to render or material mode the geometry of any
* active sculpt session needs to be recalculated. */
for (Object *ob = bmain->objects.first; ob ; ob = ob->id.next) {