Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Code Cleanup: Just some fixes for whitespace/typos that I noticed while working on other stuff

Browse Source
This commit is contained in:
Joshua Leung
2016-08-29 01:37:14 +12:00
parent 20c708d471
commit 71eaa28d0e
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/gpencil/gpencil_intern.h
View File

@@ -183,7 +183,7 @@ void gp_subdivide_stroke(bGPDstroke *gps, const int new_totpoints);
/** /**
* Add randomness to stroke * Add randomness to stroke
* \param gps Stroke data * \param gps Stroke data
* \param brsuh Brush data * \param brush Brush data
*/ */
void gp_randomize_stroke(bGPDstroke *gps, bGPDbrush *brush); void gp_randomize_stroke(bGPDstroke *gps, bGPDbrush *brush);
@@ -199,6 +199,7 @@ EnumPropertyItem *ED_gpencil_brushes_enum_itemf(bContext *C, PointerRNA *UNUSED(
/* Enums of GP palettes */ /* Enums of GP palettes */
EnumPropertyItem *ED_gpencil_palettes_enum_itemf(bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), EnumPropertyItem *ED_gpencil_palettes_enum_itemf(bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop),
bool *r_free); bool *r_free);
/* ***************************************************** */ /* ***************************************************** */
/* Operator Defines */ /* Operator Defines */
@@ -303,10 +304,10 @@ void GPENCIL_OT_palette_add(struct wmOperatorType *ot);
void GPENCIL_OT_palette_remove(struct wmOperatorType *ot); void GPENCIL_OT_palette_remove(struct wmOperatorType *ot);
void GPENCIL_OT_palette_change(struct wmOperatorType *ot); void GPENCIL_OT_palette_change(struct wmOperatorType *ot);
void GPENCIL_OT_palette_lock_layer(struct wmOperatorType *ot); void GPENCIL_OT_palette_lock_layer(struct wmOperatorType *ot);
void GPENCIL_OT_palettecolor_add(struct wmOperatorType *ot); void GPENCIL_OT_palettecolor_add(struct wmOperatorType *ot);
void GPENCIL_OT_palettecolor_remove(struct wmOperatorType *ot); void GPENCIL_OT_palettecolor_remove(struct wmOperatorType *ot);
void GPENCIL_OT_palettecolor_isolate(struct wmOperatorType *ot); void GPENCIL_OT_palettecolor_isolate(struct wmOperatorType *ot);
void GPENCIL_OT_palettecolor_hide(struct wmOperatorType *ot); void GPENCIL_OT_palettecolor_hide(struct wmOperatorType *ot);
void GPENCIL_OT_palettecolor_reveal(struct wmOperatorType *ot); void GPENCIL_OT_palettecolor_reveal(struct wmOperatorType *ot);
void GPENCIL_OT_palettecolor_lock_all(struct wmOperatorType *ot); void GPENCIL_OT_palettecolor_lock_all(struct wmOperatorType *ot);
@@ -366,6 +367,9 @@ typedef enum ACTCONT_TYPES {
ACTCONT_GPENCIL ACTCONT_GPENCIL
} ACTCONT_TYPES; } ACTCONT_TYPES;
/* ****************************************************** */
/* Stroke Iteration Utilities */
/** /**
* Iterate over all editable strokes in the current context, * Iterate over all editable strokes in the current context,
* stopping on each usable layer + stroke pair (i.e. gpl and gps) * stopping on each usable layer + stroke pair (i.e. gpl and gps)
@@ -401,4 +405,6 @@ typedef enum ACTCONT_TYPES {
CTX_DATA_END; \ CTX_DATA_END; \
} (void)0 } (void)0
/* ****************************************************** */
#endif /* __GPENCIL_INTERN_H__ */ #endif /* __GPENCIL_INTERN_H__ */

6
source/blender/editors/gpencil/gpencil_utils.c
View File

@@ -883,10 +883,12 @@ void gp_randomize_stroke(bGPDstroke *gps, bGPDbrush *brush)
float normal[3]; float normal[3];
cross_v3_v3v3(normal, v1, v2); cross_v3_v3v3(normal, v1, v2);
normalize_v3(normal); normalize_v3(normal);
/* get orthogonal vector to plane to rotate random effect */ /* get orthogonal vector to plane to rotate random effect */
float ortho[3]; float ortho[3];
cross_v3_v3v3(ortho, v1, normal); cross_v3_v3v3(ortho, v1, normal);
normalize_v3(ortho); normalize_v3(ortho);
/* Read all points and apply shift vector (first and last point not modified) */ /* Read all points and apply shift vector (first and last point not modified) */
for (int i = 1; i < gps->totpoints - 1; ++i) { for (int i = 1; i < gps->totpoints - 1; ++i) {
bGPDspoint *pt = &gps->points[i]; bGPDspoint *pt = &gps->points[i];
@@ -955,8 +957,8 @@ bool ED_gpencil_stroke_minmax(
} }
return changed; return changed;
} }
/* Dynamic Enums of GP Brushes */
/* Dynamic Enums of GP Brushes */
EnumPropertyItem *ED_gpencil_brushes_enum_itemf( EnumPropertyItem *ED_gpencil_brushes_enum_itemf(
bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop),
bool *r_free) bool *r_free)
@@ -990,8 +992,8 @@ EnumPropertyItem *ED_gpencil_brushes_enum_itemf(
return item; return item;
} }
/* Dynamic Enums of GP Palettes */
/* Dynamic Enums of GP Palettes */
EnumPropertyItem *ED_gpencil_palettes_enum_itemf( EnumPropertyItem *ED_gpencil_palettes_enum_itemf(
bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop),
bool *r_free) bool *r_free)