diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-15 16:59:38 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-15 16:59:38 +0300 |
| commit | 77497175fa1f2f3aacf4ab966df9d7223d4034cc (patch) | |
| tree | 34e143b88d2f9857e6926a1d156b8d8c3243d7b2 /source/blender/makesdna/DNA_scene_types.h | |
| parent | 90d80ddaa28908048e428fd08c4c771c015a0d66 (diff) | |
Cleanup/refactor: no new general arg-less macros enforcing var names please!
We do have an history of those pieces of evil in our code, would be nice
to get fully rid of it, but at the very least let's not add more of them
in new code. :)
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 34b1afdf331..44eb0881089 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1980,10 +1980,10 @@ extern const char *RE_engine_id_CYCLES; #define BASACT (scene->basact) #define OBACT (BASACT ? BASACT->object: NULL) -#define FIRSTBASE_NEW (sl)->object_bases.first -#define LASTBASE_NEW (sl)->object_bases.last -#define BASACT_NEW ((sl)->basact) -#define OBACT_NEW (BASACT_NEW ? BASACT_NEW->object: NULL) +#define FIRSTBASE_NEW(_sl) ((_sl)->object_bases.first) +#define LASTBASE_NEW(_sl) ((_sl)->object_bases.last) +#define BASACT_NEW(_sl) ((_sl)->basact) +#define OBACT_NEW(_sl) (BASACT_NEW(_sl) ? BASACT_NEW(_sl)->object: NULL) #define V3D_CAMERA_LOCAL(v3d) ((!(v3d)->scenelock && (v3d)->camera) ? (v3d)->camera : NULL) #define V3D_CAMERA_SCENE(scene, v3d) ((!(v3d)->scenelock && (v3d)->camera) ? (v3d)->camera : (scene)->camera) |