diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-15 18:43:18 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-15 18:43:18 +0300 |
| commit | ecc57e7524bf04d498646715dcf4f9340ef3fc56 (patch) | |
| tree | 220f951e1ff1be7bc769a1401845928f3f581330 /source/blender/blenlib | |
| parent | 9c629b06bfdf645c009d953902c936b82900053a (diff) | |
| parent | d645b1a78a752950d061a4ccb125721acade5544 (diff) | |
Merge branch 'master' into blender2.8
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 adc7bf5af6b..c913510bda3 100644 --- a/source/blender/blenlib/BLI_callbacks.h +++ b/source/blender/blenlib/BLI_callbacks.h @@ -62,7 +62,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); } } |