kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

style cleanup

Browse Source
This commit is contained in:
Campbell Barton 2012-12-09 05:15:21 +00:00
parent 78c7951463
commit f795e1cfd2
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenlib/intern/string_cursor_utf8.c
View File

@ -150,7 +150,7 @@ void BLI_str_cursor_step_utf8(const char *str, size_t maxlen,
* list of special character, ctr -> */
while (TRUE) {
if ((jump != STRCUR_JUMP_ALL) && (delim_type != cursor_delim_type(&str[*pos]))) {
break;
break;
}
else if ((*pos) >= maxlen) {
break;

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

@ -1329,46 +1329,46 @@ typedef struct Scene {
#define TESTBASE(v3d, base) ( \
((base)->flag & SELECT) && \
((base)->lay & v3d->lay) && \
(((base)->object->restrictflag & OB_RESTRICT_VIEW)==0) )
(((base)->object->restrictflag & OB_RESTRICT_VIEW) == 0))
#define TESTBASELIB(v3d, base) ( \
((base)->flag & SELECT) && \
((base)->lay & v3d->lay) && \
((base)->object->id.lib==NULL) && \
(((base)->object->restrictflag & OB_RESTRICT_VIEW)==0) )
((base)->object->id.lib == NULL) && \
(((base)->object->restrictflag & OB_RESTRICT_VIEW) == 0))
#define TESTBASELIB_BGMODE(v3d, scene, base) ( \
((base)->flag & SELECT) && \
((base)->lay & (v3d ? v3d->lay : scene->lay)) && \
((base)->object->id.lib==NULL) && \
(((base)->object->restrictflag & OB_RESTRICT_VIEW)==0) )
((base)->object->id.lib == NULL) && \
(((base)->object->restrictflag & OB_RESTRICT_VIEW) == 0))
#define BASE_EDITABLE_BGMODE(v3d, scene, base) ( \
((base)->lay & (v3d ? v3d->lay : scene->lay)) && \
((base)->object->id.lib==NULL) && \
(((base)->object->restrictflag & OB_RESTRICT_VIEW)==0))
((base)->object->id.lib == NULL) && \
(((base)->object->restrictflag & OB_RESTRICT_VIEW) == 0))
#define BASE_SELECTABLE(v3d, base) ( \
(base->lay & v3d->lay) && \
(base->object->restrictflag & (OB_RESTRICT_SELECT|OB_RESTRICT_VIEW))==0 )
(base->object->restrictflag & (OB_RESTRICT_SELECT | OB_RESTRICT_VIEW)) == 0)
#define BASE_VISIBLE(v3d, base) ( \
(base->lay & v3d->lay) && \
(base->object->restrictflag & OB_RESTRICT_VIEW)==0 )
(base->object->restrictflag & OB_RESTRICT_VIEW) == 0)
#define FIRSTBASE scene->base.first
#define LASTBASE scene->base.last
#define BASACT (scene->basact)
#define OBACT (BASACT? BASACT->object: NULL)
#define OBACT (BASACT ? BASACT->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)
#define CFRA (scene->r.cfra)
#define SUBFRA (scene->r.subframe)
#define SFRA (scene->r.sfra)
#define EFRA (scene->r.efra)
#define PRVRANGEON (scene->r.flag & SCER_PRV_RANGE)
#define PSFRA ((PRVRANGEON) ? (scene->r.psfra) : (scene->r.sfra))
#define PEFRA ((PRVRANGEON) ? (scene->r.pefra) : (scene->r.efra))
#define FRA2TIME(a) ((((double) scene->r.frs_sec_base) * (double)(a)) / (double)scene->r.frs_sec)
#define TIME2FRA(a) ((((double) scene->r.frs_sec) * (double)(a)) / (double)scene->r.frs_sec_base)
#define FPS (((double) scene->r.frs_sec) / (double)scene->r.frs_sec_base)
#define CFRA (scene->r.cfra)
#define SUBFRA (scene->r.subframe)
#define SFRA (scene->r.sfra)
#define EFRA (scene->r.efra)
#define PRVRANGEON (scene->r.flag & SCER_PRV_RANGE)
#define PSFRA ((PRVRANGEON) ? (scene->r.psfra) : (scene->r.sfra))
#define PEFRA ((PRVRANGEON) ? (scene->r.pefra) : (scene->r.efra))
#define FRA2TIME(a) ((((double) scene->r.frs_sec_base) * (double)(a)) / (double)scene->r.frs_sec)
#define TIME2FRA(a) ((((double) scene->r.frs_sec) * (double)(a)) / (double)scene->r.frs_sec_base)
#define FPS (((double) scene->r.frs_sec) / (double)scene->r.frs_sec_base)
/* base->flag is in DNA_object_types.h */
@ -1600,4 +1600,4 @@ typedef enum SculptFlags {
}
#endif
#endif
#endif /* __DNA_SCENE_TYPES_H__ */