forked from bartvdbraak/blender
Minor change to last commit
This commit is contained in:
parent
6b2cf4e86e
commit
4a2b64e43d
@ -1948,9 +1948,9 @@ extern const char *RE_engine_id_CYCLES;
|
|||||||
#define OBEDIT_FROM_WORKSPACE(workspace, _view_layer) \
|
#define OBEDIT_FROM_WORKSPACE(workspace, _view_layer) \
|
||||||
(((workspace)->object_mode & OD_MODE_EDIT) ? OBACT(_view_layer) : NULL)
|
(((workspace)->object_mode & OD_MODE_EDIT) ? OBACT(_view_layer) : NULL)
|
||||||
#define OBEDIT_FROM_OBACT(ob) \
|
#define OBEDIT_FROM_OBACT(ob) \
|
||||||
(((ob)->mode & OB_MODE_EDIT) ? ob : NULL)
|
((ob) ? (((ob)->mode & OB_MODE_EDIT) ? ob : NULL) : NULL)
|
||||||
#define OBEDIT_FROM_VIEW_LAYER(view_layer) \
|
#define OBEDIT_FROM_VIEW_LAYER(view_layer) \
|
||||||
OBEDIT_FROM_OBACT(OBACT(view_layer) ? OBACT(view_layer) : NULL)
|
OBEDIT_FROM_OBACT(OBACT(view_layer))
|
||||||
|
|
||||||
#define V3D_CAMERA_LOCAL(v3d) ((!(v3d)->scenelock && (v3d)->camera) ? (v3d)->camera : 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)
|
#define V3D_CAMERA_SCENE(scene, v3d) ((!(v3d)->scenelock && (v3d)->camera) ? (v3d)->camera : (scene)->camera)
|
||||||
|
Loading…
Reference in New Issue
Block a user