archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton
2019-03-26 10:15:46 +11:00
parent a750dea74e
commit adfdae3fc2
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_dynamicpaint.h
View File

@@ -22,9 +22,9 @@
*/
struct Depsgraph;
struct DynamicPaintRuntime;
struct DynamicPaintCanvasSettings;
struct DynamicPaintModifierData;
struct DynamicPaintRuntime;
struct Main;
struct Scene;
struct ViewLayer;

2
source/blender/blenkernel/BKE_paint.h
View File

@@ -50,13 +50,13 @@ struct Scene;
struct Sculpt;
struct StrokeCache;
struct SubdivCCG;
struct SubdivCCG;
struct Tex;
struct ToolSettings;
struct UnifiedPaintSettings;
struct ViewLayer;
struct bContext;
struct bToolRef;
struct SubdivCCG;
enum eOverlayFlags;

3
source/blender/blenloader/intern/readfile.c
View File

@@ -2619,8 +2619,7 @@ static void lib_link_brush(FileData *fd, Main *main)
/* link default grease pencil palette */
if (brush->gpencil_settings != NULL)
{
if (brush->gpencil_settings->flag & GP_BRUSH_MATERIAL_PINNED)
{
if (brush->gpencil_settings->flag & GP_BRUSH_MATERIAL_PINNED) {
brush->gpencil_settings->material = newlibadr_us(fd, brush->id.lib, brush->gpencil_settings->material);
if (!brush->gpencil_settings->material) {

2
source/blender/editors/gpencil/gpencil_primitive.c
View File

@@ -140,7 +140,7 @@ static void gp_init_colors(tGPDprimitive *p)
MaterialGPencilStyle *gp_style = NULL;
/* use brush material */
p->mat = BKE_gpencil_current_input_brush_material(p->bmain,p->ob, brush);
p->mat = BKE_gpencil_current_input_brush_material(p->bmain, p->ob, brush);
/* assign color information to temp data */
gp_style = p->mat->gp_style;

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

@@ -1729,9 +1729,9 @@ static void gp_brush_cursor_draw(bContext *C, int x, int y, void *customdata)
* The decision was to use a fix size, instead of brush->thickness value.
*/
if ((gp_style) && (GPENCIL_PAINT_MODE(gpd)) &&
((brush->gpencil_settings->flag & GP_BRUSH_STABILIZE_MOUSE) == 0) &&
((brush->gpencil_settings->flag & GP_BRUSH_STABILIZE_MOUSE_TEMP) == 0) &&
(brush->gpencil_tool == GPAINT_TOOL_DRAW))
((brush->gpencil_settings->flag & GP_BRUSH_STABILIZE_MOUSE) == 0) &&
((brush->gpencil_settings->flag & GP_BRUSH_STABILIZE_MOUSE_TEMP) == 0) &&
(brush->gpencil_tool == GPAINT_TOOL_DRAW))
{
radius = 2.0f;
copy_v3_v3(color, gp_style->stroke_rgba);