blender
/
blender
132
398
Fork 577
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

Cleanup: style, duplicate includes

This commit is contained in:
Campbell Barton 2019-02-13 11:00:07 +11:00
parent 61e2e609a1
commit 9a8a5676da
Notes: blender-bot 2023-02-14 06:21:59 +01:00 
Referenced by issue #61499, Missing Camera settings in props except Depth of Field
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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) &&

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

@ -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);

5
source/blender/editors/mesh/editmesh_bevel.c
View File

@ -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);