[Bf-blender-cvs] [07153475aba] lanpr-under-gp: LineArt: Cleanup code.
YimingWu
noreply at git.blender.org
Tue Jul 14 15:32:35 CEST 2020
Commit: 07153475abade51d04b86c65bb3f1883a2665ce2
Author: YimingWu
Date: Tue Jul 14 21:32:30 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB07153475abade51d04b86c65bb3f1883a2665ce2
LineArt: Cleanup code.
===================================================================
M source/blender/editors/include/ED_lineart.h
M source/blender/editors/lineart/lineart_cpu.c
===================================================================
diff --git a/source/blender/editors/include/ED_lineart.h b/source/blender/editors/include/ED_lineart.h
index 72d8d4d1d42..dabbfcd3166 100644
--- a/source/blender/editors/include/ED_lineart.h
+++ b/source/blender/editors/include/ED_lineart.h
@@ -290,7 +290,7 @@ typedef struct LineartSharedResource {
*/
SpinLock lock_render_status;
eLineartRenderStatus flag_render_status;
- eLineartModifierSyncStatus fflag_sync_staus;
+ eLineartModifierSyncStatus flag_sync_staus;
/** Geometry loading is done in the worker thread,
* Lock the render thread until loading is done, so that
diff --git a/source/blender/editors/lineart/lineart_cpu.c b/source/blender/editors/lineart/lineart_cpu.c
index 3179ad0aa0d..af5c0e4a30f 100644
--- a/source/blender/editors/lineart/lineart_cpu.c
+++ b/source/blender/editors/lineart/lineart_cpu.c
@@ -2442,7 +2442,7 @@ void ED_lineart_modifier_sync_set_flag(eLineartModifierSyncStatus flag, bool is_
{
BLI_spin_lock(&lineart_share.lock_render_status);
- lineart_share.fflag_sync_staus = flag;
+ lineart_share.flag_sync_staus = flag;
BLI_spin_unlock(&lineart_share.lock_render_status);
}
@@ -2451,7 +2451,7 @@ bool ED_lineart_modifier_sync_flag_check(eLineartModifierSyncStatus flag)
{
bool match;
BLI_spin_lock(&lineart_share.lock_render_status);
- match = (lineart_share.fflag_sync_staus == flag);
+ match = (lineart_share.flag_sync_staus == flag);
BLI_spin_unlock(&lineart_share.lock_render_status);
return match;
}
@@ -3388,8 +3388,8 @@ static LineartBoundingArea *lineart_get_bounding_area(LineartRenderBuffer *rb, d
}
return iba;
}
-s tatic LineartBoundingArea *lineart_get_first_possible_bounding_area(LineartRenderBuffer *rb,
- LineartRenderLine *rl)
+static LineartBoundingArea *lineart_get_first_possible_bounding_area(LineartRenderBuffer *rb,
+ LineartRenderLine *rl)
{
LineartBoundingArea *iba;
double data[2] = {rl->l->fbcoord[0], rl->l->fbcoord[1]};
More information about the Bf-blender-cvs
mailing list