diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-06-06 18:01:20 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-06-06 19:57:47 +0300 |
| commit | 7f01329a84a6c8e90988e38cab7dd7f070d06795 (patch) | |
| tree | 2e731f809f022090fddb399ee004cea8aaa98259 /source/blender | |
| parent | 6d2aabc1d00e4e5aa57175b2cbf6fd02bc3be636 (diff) | |
Small cleanup: Use ELEM and wrong identation
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/draw/engines/clay/clay_engine.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 8 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_viewport.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/draw/engines/clay/clay_engine.c b/source/blender/draw/engines/clay/clay_engine.c index 9c74196e2bd..845e946c454 100644 --- a/source/blender/draw/engines/clay/clay_engine.c +++ b/source/blender/draw/engines/clay/clay_engine.c @@ -933,8 +933,8 @@ RenderEngineType DRW_engine_viewport_clay_type = { NULL, NULL, CLAY_ENGINE, N_("Clay"), RE_INTERNAL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - &CLAY_layer_collection_settings_create, - &CLAY_scene_layer_settings_create, + &CLAY_layer_collection_settings_create, + &CLAY_scene_layer_settings_create, &draw_engine_clay_type, {NULL, NULL, NULL} }; diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index 1f59007d3b4..deaa2885ea3 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -662,10 +662,10 @@ static int buttons_context_path(const bContext *C, ButsContextPath *path, int ma case BCONTEXT_BONE_CONSTRAINT: found = buttons_context_path_pose_bone(path); break; - case BCONTEXT_COLLECTION: - found = buttons_context_path_collection(C, path); - break; - default: + case BCONTEXT_COLLECTION: + found = buttons_context_path_collection(C, path); + break; + default: found = 0; break; } diff --git a/source/blender/gpu/intern/gpu_viewport.c b/source/blender/gpu/intern/gpu_viewport.c index 49c8d37f6f1..50d2f1e6b18 100644 --- a/source/blender/gpu/intern/gpu_viewport.c +++ b/source/blender/gpu/intern/gpu_viewport.c @@ -281,7 +281,7 @@ bool GPU_viewport_cache_validate(GPUViewport *viewport, unsigned int hash) bool dirty = false; /* TODO for testing only, we need proper cache invalidation */ - if (G.debug_value != 666 && G.debug_value != 667) { + if (ELEM(G.debug_value, 666, 667) == false) { for (LinkData *link = viewport->data.first; link; link = link->next) { ViewportEngineData *data = link->data; int psl_len; |