diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-09-14 16:04:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-09-14 16:04:10 +0400 |
| commit | 811669c14e7b46a8e1fd00aa05855ba2cf3ab9c4 (patch) | |
| tree | e66de4afc1bf0a679651af222a2308b3de2c2acf /source/blender | |
| parent | 7114ab18a2f58f2130e3a0986691900281adfade (diff) | |
minor style clanup and use more meaningful name for 3DCONNEXION source code.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/interface/interface.c | 8 | ||||
| -rw-r--r-- | source/blender/editors/screen/area.c | 6 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_mask_types.h | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_tracking_types.h | 2 |
4 files changed, 11 insertions, 7 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index e30d9ce5b78..111757da01f 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -962,10 +962,12 @@ static bool ui_but_event_property_operator_string(const bContext *C, uiBut *but, data_path = BLI_sprintfN("scene.%s", path); MEM_freeN(path); } - /*else { - printf("ERROR in %s(): Couldn't get path for scene property - %s\n", +#if 0 + else { + printf("ERROR in %s(): Couldn't get path for scene property - %s\n", __func__, RNA_property_identifier(but->rnaprop)); - }*/ + } +#endif } } else { diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 7cbc8c9b277..91d1985cd00 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -1696,8 +1696,10 @@ void ED_region_panels(const bContext *C, ARegion *ar, int vertical, const char * /* Note: this code scales fine, but because of rounding differences, positions of elements * flip +1 or -1 pixel compared to redoing the entire layout again. * Leaving in commented code for future tests */ - /* uiScalePanels(ar, BLI_rctf_size_x(&v2d->cur)); - break; */ +#if 0 + uiScalePanels(ar, BLI_rctf_size_x(&v2d->cur)); + break; +#endif } else { break; diff --git a/source/blender/makesdna/DNA_mask_types.h b/source/blender/makesdna/DNA_mask_types.h index 1b1c912d179..4307ea57f15 100644 --- a/source/blender/makesdna/DNA_mask_types.h +++ b/source/blender/makesdna/DNA_mask_types.h @@ -67,7 +67,7 @@ typedef struct MaskParent { char sub_parent[64]; /* sub-entity of parent to which parenting happened * in case of parenting to movie tracking data contains name of track */ float parent_orig[2]; /* track location at the moment of parenting, - stored in mask space*/ + * stored in mask space*/ float parent_corners_orig[4][2]; /* Original corners of plane track at the moment of parenting */ } MaskParent; diff --git a/source/blender/makesdna/DNA_tracking_types.h b/source/blender/makesdna/DNA_tracking_types.h index 3eafbee1bad..49c1e3ed35d 100644 --- a/source/blender/makesdna/DNA_tracking_types.h +++ b/source/blender/makesdna/DNA_tracking_types.h @@ -170,7 +170,7 @@ typedef struct MovieTrackingPlaneTrack { char name[64]; /* MAX_NAME */ MovieTrackingTrack **point_tracks; /* Array of point tracks used to define this plane. - Each element is a pointer to MovieTrackingTrack. */ + * Each element is a pointer to MovieTrackingTrack. */ int point_tracksnr, pad; /* Number of tracks in point_tracks array. */ MovieTrackingPlaneMarker *markers; /* Markers in the plane track */ |