diff options
author | Hans Goudey <h.goudey@me.com> | 2020-08-12 17:27:24 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2020-08-12 17:27:24 +0300 |
commit | bb3d0e49042c7bf5dbfb4dfa782de71edd441845 (patch) | |
tree | 099599d647f57656e4b89042b8d0b6ad9a5e8c65 /source/blender/editors/space_nla | |
parent | a5e456f91362cdaf95d68189d3944047d90b68e7 (diff) | |
parent | 2c7394acce1a4c1af0bd620147f9ae17da38562e (diff) |
Merge branch 'master' into fcurve-modifier-panels
Diffstat (limited to 'source/blender/editors/space_nla')
-rw-r--r-- | source/blender/editors/space_nla/nla_draw.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_nla/nla_intern.h | 5 | ||||
-rw-r--r-- | source/blender/editors/space_nla/space_nla.c | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c index 96599fd92a7..97939a93d01 100644 --- a/source/blender/editors/space_nla/nla_draw.c +++ b/source/blender/editors/space_nla/nla_draw.c @@ -378,7 +378,7 @@ static void nla_draw_strip_curves(NlaStrip *strip, float yminc, float ymaxc, uin } /* helper call to setup dashed-lines for strip outlines */ -static uint nla_draw_use_dashed_outlines(float color[4], bool muted) +static uint nla_draw_use_dashed_outlines(const float color[4], bool muted) { /* Note that we use dashed shader here, and make it draw solid lines if not muted... */ uint shdr_pos = GPU_vertformat_attr_add( diff --git a/source/blender/editors/space_nla/nla_intern.h b/source/blender/editors/space_nla/nla_intern.h index 6b0429230fe..9a9ea161f56 100644 --- a/source/blender/editors/space_nla/nla_intern.h +++ b/source/blender/editors/space_nla/nla_intern.h @@ -21,8 +21,7 @@ * \ingroup spnla */ -#ifndef __NLA_INTERN_H__ -#define __NLA_INTERN_H__ +#pragma once /* internal exports only */ @@ -149,5 +148,3 @@ bool nlaedit_is_tweakmode_on(bAnimContext *ac); void nla_operatortypes(void); void nla_keymap(wmKeyConfig *keyconf); - -#endif /* __NLA_INTERN_H__ */ diff --git a/source/blender/editors/space_nla/space_nla.c b/source/blender/editors/space_nla/space_nla.c index b09536e0621..7bbfe451eed 100644 --- a/source/blender/editors/space_nla/space_nla.c +++ b/source/blender/editors/space_nla/space_nla.c @@ -57,7 +57,7 @@ /* ******************** default callbacks for nla space ***************** */ -static SpaceLink *nla_new(const ScrArea *area, const Scene *scene) +static SpaceLink *nla_create(const ScrArea *area, const Scene *scene) { ARegion *region; SpaceNla *snla; @@ -608,7 +608,7 @@ void ED_spacetype_nla(void) st->spaceid = SPACE_NLA; strncpy(st->name, "NLA", BKE_ST_MAXNAME); - st->new = nla_new; + st->create = nla_create; st->free = nla_free; st->init = nla_init; st->duplicate = nla_duplicate; |