blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Minor change to last commit

This commit is contained in:
Campbell Barton 2018-04-06 18:17:18 +02:00
parent 6b2cf4e86e
commit 4a2b64e43d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/makesdna/DNA_scene_types.h
View File

@ -1948,9 +1948,9 @@ extern const char *RE_engine_id_CYCLES;
#define OBEDIT_FROM_WORKSPACE(workspace, _view_layer) \
(((workspace)->object_mode & OD_MODE_EDIT) ? OBACT(_view_layer) : NULL)
#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) \
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_SCENE(scene, v3d) ((!(v3d)->scenelock && (v3d)->camera) ? (v3d)->camera : (scene)->camera)