diff options
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/BLI_callbacks.h | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/callbacks.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenlib/BLI_callbacks.h b/source/blender/blenlib/BLI_callbacks.h index fdffbeb4c8d..6eb45107488 100644 --- a/source/blender/blenlib/BLI_callbacks.h +++ b/source/blender/blenlib/BLI_callbacks.h @@ -66,7 +66,7 @@ typedef struct bCallbackFuncStore { } bCallbackFuncStore; -void BLI_callback_exec(struct Main *main, struct ID *self, eCbEvent evt); +void BLI_callback_exec(struct Main *bmain, struct ID *self, eCbEvent evt); void BLI_callback_add(bCallbackFuncStore *funcstore, eCbEvent evt); void BLI_callback_global_init(void); diff --git a/source/blender/blenlib/intern/callbacks.c b/source/blender/blenlib/intern/callbacks.c index 191be49263c..766e3f38f00 100644 --- a/source/blender/blenlib/intern/callbacks.c +++ b/source/blender/blenlib/intern/callbacks.c @@ -32,13 +32,13 @@ static ListBase callback_slots[BLI_CB_EVT_TOT] = {{NULL}}; -void BLI_callback_exec(struct Main *main, struct ID *self, eCbEvent evt) +void BLI_callback_exec(struct Main *bmain, struct ID *self, eCbEvent evt) { ListBase *lb = &callback_slots[evt]; bCallbackFuncStore *funcstore; for (funcstore = lb->first; funcstore; funcstore = funcstore->next) { - funcstore->func(main, self, funcstore->arg); + funcstore->func(bmain, self, funcstore->arg); } } |