Commit: 9a8a5676da82d58fee893c8006ce5c9c2b5c94f3
Author: Campbell Barton
Date: Wed Feb 13 11:00:07 2019 +1100
Branches: master
https://developer.blender.org/rB9a8a5676da82d58fee893c8006ce5c9c2b5c94f3
Cleanup: style, duplicate includes
===================================================================
M source/blender/blenloader/intern/readfile.c
M source/blender/editors/gpencil/gpencil_utils.c
M source/blender/editors/mesh/editmesh_bevel.c
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index 55a72e363e9..7d5494b1612 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -10409,8 +10409,7 @@ static void add_collections_to_scene(
* instantiate its objects in active scene's
collection directly. See T61141.
* Note that we only check object directly into
that collection, not recursively into its children.
*/
- for (CollectionObject *coll_ob =
collection->gobject.first; coll_ob != NULL; coll_ob = coll_ob->next)
- {
+ for (CollectionObject *coll_ob =
collection->gobject.first; coll_ob != NULL; coll_ob = coll_ob->next) {
Object *ob = coll_ob->ob;
if ((ob->id.tag & LIB_TAG_PRE_EXISTING)
== 0 &&
(ob->id.lib == lib) &&
diff --git a/source/blender/editors/gpencil/gpencil_utils.c
b/source/blender/editors/gpencil/gpencil_utils.c
index cdaa8b343a3..3154a89da5e 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -1654,8 +1654,8 @@ static void gp_brush_cursor_draw(bContext *C, int x, int
y, void *customdata)
/* while drawing hide */
if ((gpd->runtime.sbuffer_size > 0) &&
- ((brush->gpencil_settings->flag &
GP_BRUSH_STABILIZE_MOUSE) == 0) &&
- ((brush->gpencil_settings->flag &
GP_BRUSH_STABILIZE_MOUSE_TEMP) == 0))
+ ((brush->gpencil_settings->flag & GP_BRUSH_STABILIZE_MOUSE)
== 0) &&
+ ((brush->gpencil_settings->flag &
GP_BRUSH_STABILIZE_MOUSE_TEMP) == 0))
{
return;
}
@@ -1685,9 +1685,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);
diff --git a/source/blender/editors/mesh/editmesh_bevel.c
b/source/blender/editors/mesh/editmesh_bevel.c
index 29dde0e5200..219437bc3fd 100644
--- a/source/blender/editors/mesh/editmesh_bevel.c
+++ b/source/blender/editors/mesh/editmesh_bevel.c
@@ -50,9 +50,6 @@
#include "ED_transform.h"
#include "ED_view3d.h"
-#include "WM_api.h"
-#include "WM_types.h"
-
#include "mesh_intern.h" /* own include */
@@ -604,7 +601,7 @@ static int edbm_bevel_modal(bContext *C, wmOperator *op,
const wmEvent *event)
edbm_bevel_update_header(C, op);
handled = true;
}
- else if (event->type == EVT_MODAL_MAP){
+ else if (event->type == EVT_MODAL_MAP) {
switch (event->val) {
case BEV_MODAL_CANCEL:
edbm_bevel_cancel(C, op);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
