Commit: 7cb674d5211c5f5fa04e9aa618dbb562ff812e48
Author: YimingWu
Date: Mon Jun 17 15:08:06 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB7cb674d5211c5f5fa04e9aa618dbb562ff812e48
LANPR: make format
===================================================================
M intern/ghost/intern/GHOST_ContextCGL.mm
M intern/ghost/intern/GHOST_SystemCocoa.mm
M source/blender/blenkernel/intern/scene.c
M source/blender/draw/engines/lanpr/lanpr_access.c
M source/blender/draw/engines/lanpr/lanpr_access.h
M source/blender/draw/engines/lanpr/lanpr_all.h
M source/blender/draw/engines/lanpr/lanpr_chain.c
M source/blender/draw/engines/lanpr/lanpr_data_types.h
M source/blender/draw/engines/lanpr/lanpr_engine.c
M source/blender/draw/engines/lanpr/lanpr_ops.c
M source/blender/draw/engines/lanpr/lanpr_snake.c
M source/blender/draw/intern/draw_manager.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilbackbonestretch.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilstroke.c
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/modifiers/intern/MOD_featureline.c
===================================================================
diff --git a/intern/ghost/intern/GHOST_ContextCGL.mm
b/intern/ghost/intern/GHOST_ContextCGL.mm
index 12c340ffe97..0fca41306a6 100644
--- a/intern/ghost/intern/GHOST_ContextCGL.mm
+++ b/intern/ghost/intern/GHOST_ContextCGL.mm
@@ -34,7 +34,8 @@
static void ghost_fatal_error_dialog(const char *msg)
{
- @autoreleasepool {
+ @autoreleasepool
+ {
NSString *message = [NSString stringWithFormat:@"Error opening
window:\n%s", msg];
NSAlert *alert = [[NSAlert alloc] init];
@@ -337,7 +338,8 @@ static const OSType METAL_CORE_VIDEO_PIXEL_FORMAT =
kCVPixelFormatType_32BGRA;
void GHOST_ContextCGL::metalInit()
{
- @autoreleasepool {
+ @autoreleasepool
+ {
id<MTLDevice> device = m_metalLayer.device;
// Create a command queue for blit/present operation
@@ -532,7 +534,8 @@ void GHOST_ContextCGL::metalUpdateFramebuffer()
void GHOST_ContextCGL::metalSwapBuffers()
{
- @autoreleasepool {
+ @autoreleasepool
+ {
updateDrawingContext();
glFlush();
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm
b/intern/ghost/intern/GHOST_SystemCocoa.mm
index 376ebfa2a21..80a521a7ca5 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemCocoa.mm
@@ -1358,7 +1358,8 @@ bool GHOST_SystemCocoa::handleOpenDocumentRequest(void
*filepathStr)
// Check open windows if some changes are not saved
if (m_windowManager->getAnyModifiedState()) {
- @autoreleasepool {
+ @autoreleasepool
+ {
NSAlert *alert = [[NSAlert alloc] init];
NSString *title = [NSString stringWithFormat:@"Opening %@", [filepath
lastPathComponent]];
NSString *text = @"Current document has not been saved.\nDo you really
want to proceed?";
diff --git a/source/blender/blenkernel/intern/scene.c
b/source/blender/blenkernel/intern/scene.c
index fdbc7883dd1..605dca003db 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -338,8 +338,7 @@ void BKE_scene_copy_data(Main *bmain, Scene *sce_dst, const
Scene *sce_src, cons
/* lanpr data */
- lanpr_copy_data(sce_src,sce_dst);
-
+ lanpr_copy_data(sce_src, sce_dst);
}
Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type)
diff --git a/source/blender/draw/engines/lanpr/lanpr_access.c
b/source/blender/draw/engines/lanpr/lanpr_access.c
index fb3b34d7b35..50abf53bbd2 100644
--- a/source/blender/draw/engines/lanpr/lanpr_access.c
+++ b/source/blender/draw/engines/lanpr/lanpr_access.c
@@ -290,44 +290,46 @@ void lanpr_update_data_for_external(Depsgraph *depsgraph)
SceneLANPR *lanpr = &scene->lanpr;
if (lanpr->master_mode != LANPR_MASTER_MODE_SOFTWARE)
return;
- if (!lanpr_share.render_buffer_shared ||
lanpr_share.render_buffer_shared->cached_for_frame != scene->r.cfra) {
+ if (!lanpr_share.render_buffer_shared ||
+ lanpr_share.render_buffer_shared->cached_for_frame != scene->r.cfra) {
lanpr_compute_feature_lines_internal(depsgraph, lanpr, scene);
}
}
-void lanpr_copy_data(Scene* from, Scene* to){
- SceneLANPR *lanpr= &from->lanpr;
- LANPR_RenderBuffer* rb = lanpr_share.render_buffer_shared, *new_rb;
- LANPR_LineLayer* ll,*new_ll;
- LANPR_LineLayerComponent* llc,*new_llc;
+void lanpr_copy_data(Scene *from, Scene *to)
+{
+ SceneLANPR *lanpr = &from->lanpr;
+ LANPR_RenderBuffer *rb = lanpr_share.render_buffer_shared, *new_rb;
+ LANPR_LineLayer *ll, *new_ll;
+ LANPR_LineLayerComponent *llc, *new_llc;
list_handle_empty(&to->lanpr.line_layers);
- for (ll = lanpr->line_layers.first;ll;ll=ll->next){
- new_ll = MEM_callocN(sizeof(LANPR_LineLayer),"Copied Line Layer");
- memcpy(new_ll,ll,sizeof(LANPR_LineLayer));
+ for (ll = lanpr->line_layers.first; ll; ll = ll->next) {
+ new_ll = MEM_callocN(sizeof(LANPR_LineLayer), "Copied Line Layer");
+ memcpy(new_ll, ll, sizeof(LANPR_LineLayer));
list_handle_empty(&new_ll->components);
- new_ll->next=new_ll->prev=NULL;
- BLI_addtail(&to->lanpr.line_layers,new_ll);
- for(llc = ll->components.first;llc;llc=llc->next){
- new_llc = MEM_callocN(sizeof(LANPR_LineLayerComponent),"Copied Line
Layer Component");
- memcpy(new_llc,llc,sizeof(LANPR_LineLayerComponent));
- new_llc->next=new_llc->prev=NULL;
- BLI_addtail(&new_ll->components,new_llc);
+ new_ll->next = new_ll->prev = NULL;
+ BLI_addtail(&to->lanpr.line_layers, new_ll);
+ for (llc = ll->components.first; llc; llc = llc->next) {
+ new_llc = MEM_callocN(sizeof(LANPR_LineLayerComponent), "Copied Line
Layer Component");
+ memcpy(new_llc, llc, sizeof(LANPR_LineLayerComponent));
+ new_llc->next = new_llc->prev = NULL;
+ BLI_addtail(&new_ll->components, new_llc);
}
}
// render_buffer now only accessible from lanpr_share
-
}
-void lanpr_free_everything(Scene* s){
- SceneLANPR *lanpr= &s->lanpr;
- LANPR_LineLayer* ll;
- LANPR_LineLayerComponent* llc;
-
- while(ll = BLI_pophead(&lanpr->line_layers)){
- while(llc=BLI_pophead(&ll->components))
+void lanpr_free_everything(Scene *s)
+{
+ SceneLANPR *lanpr = &s->lanpr;
+ LANPR_LineLayer *ll;
+ LANPR_LineLayerComponent *llc;
+
+ while (ll = BLI_pophead(&lanpr->line_layers)) {
+ while (llc = BLI_pophead(&ll->components))
MEM_freeN(llc);
MEM_freeN(ll);
}
diff --git a/source/blender/draw/engines/lanpr/lanpr_access.h
b/source/blender/draw/engines/lanpr/lanpr_access.h
index cb16c3ae962..0e3903c9f37 100644
--- a/source/blender/draw/engines/lanpr/lanpr_access.h
+++ b/source/blender/draw/engines/lanpr/lanpr_access.h
@@ -24,8 +24,8 @@ int lanpr_compute_feature_lines_internal(Depsgraph
*depsgraph, SceneLANPR *lanpr
void lanpr_destroy_render_data(struct LANPR_RenderBuffer *rb);
-void lanpr_copy_data(Scene* from, Scene* to);
+void lanpr_copy_data(Scene *from, Scene *to);
-void lanpr_free_everything(Scene* s);
+void lanpr_free_everything(Scene *s);
#endif
diff --git a/source/blender/draw/engines/lanpr/lanpr_all.h
b/source/blender/draw/engines/lanpr/lanpr_all.h
index c73880282eb..271f9227391 100644
--- a/source/blender/draw/engines/lanpr/lanpr_all.h
+++ b/source/blender/draw/engines/lanpr/lanpr_all.h
@@ -289,7 +289,7 @@ typedef struct LANPR_RenderTaskInfo {
typedef struct LANPR_RenderBuffer {
struct LANPR_RenderBuffer *prev, *next;
- int is_copied; // for render.
+ int is_copied; // for render.
int w, h;
int tile_size_w, tile_size_h;
diff --git a/source/blender/draw/engines/lanpr/lanpr_chain.c
b/source/blender/draw/engines/lanpr/lanpr_chain.c
index c77140f9df6..7c4da87b422 100644
--- a/source/blender/draw/engines/lanpr/lanpr_chain.c
+++ b/source/blender/draw/engines/lanpr/lanpr_chain.c
@@ -426,12 +426,14 @@ void
lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb, float dist_thre
}
LANPR_BoundingArea *lanpr_get_point_bounding_area(LANPR_RenderBuffer *rb, real
x, real y);
-LANPR_BoundingArea *lanpr_get_point_bounding_area_recursive(
- LANPR_RenderBuffer *rb, LANPR_BoundingArea *root, LANPR_RenderLineChainItem*
rlci){
- //if (!root->child) {
- return root;
+LANPR_BoundingArea *lanpr_get_point_bounding_area_recursive(LANPR_RenderBuffer
*rb,
+ LANPR_BoundingArea
*root,
+
LANPR_RenderLineChainItem *rlci)
+{
+ // if (!root->child) {
+ return root;
//}
- //else {
+ // else {
// LANPR_BoundingArea* ch = root->child;
// #define IN_BOUND(ba,rlci)\
// ba.l<=rlci->pos[0] && ba.r>=rlci->pos[0] && ba.b<=rlci->pos[1] &&
ba.u>=rlci->pos[1]
@@ -441,44 +443,57 @@ LANPR_BoundingArea
*lanpr_get_point_bounding_area_recursive(
// else if(IN_BOUND(ch[3],rlci)) return
lanpr_get_point_bounding_area_recursive(rb,&ch[3],rlci);
// #undef IN_BOUND
//}
- //return NULL;
+ // return NULL;
}
-LANPR_BoundingArea *lanpr_get_end_point_bounding_area(LANPR_RenderBuffer *rb,
LANPR_RenderLineChainItem* rlci){
- LANPR_BoundingArea* root =
lanpr_get_point_bounding_area(rb,rlci->pos[0],rlci->pos[1]);
- if(!root) return NULL;
- return lanpr_get_point_bounding_area_recursive(rb,root,rlci);
+LANPR_BoundingArea *lanpr_get_end_point_bounding_area(LANPR_RenderBuffer *rb,
+
LANPR_RenderLineChainItem *rlci)
+{
+ LANPR_BoundingArea *root = lanpr_get_point_bounding_area(rb, rlci->pos[0],
rlci->pos[1]);
+ if (!root)
+ return NULL;
+ return lanpr_get_point_bounding_area_recursive(rb, root, rlci);
}
// if reduction threshold is even larger than a small bounding area,
// then 1) geometry is simply too dense.
-// 2) probably need to add it to root bounding area which has larger
surface area then it will cover typical threshold values.
-void lanpr_link_point_with_bounding_area_recursive(
- LANPR_RenderBuffer *rb, LANPR_BoundingArea* root, LANPR_RenderLineChain*
rlc, LANPR_RenderLineChainItem* rlci){
- //if (!root->child) {
- LANPR_ChainRegisterEntry* cre =
list_append_pointer_static_sized(&root->linked_chains, &rb->render_data_pool,
rlc, sizeof(LANPR_ChainRegisterEntry));
- cre->rlci = rlci;
- if(rlci==rlc->chain.first) cre->is_left = 1;
+// 2) probably need to add it to root bounding area which has larger
surface area then it will
+// cover typical threshold values.
+void lanpr_link_point_with_bounding_area_recursive(LANPR_RenderBuffer *rb,
+ LANPR_BoundingArea *root,
+ LANPR_RenderLineChain *rlc,
+ LANPR_RenderLineChainItem
*rlci)
+{
+ // if (!root->child) {
+ LANPR_ChainRegisterEntry *cre = list_append_pointer_static_sized(
+ &root->linked_chains, &rb->render_data_pool, rlc,
sizeof(LANPR_ChainRegisterEntry));
+ cre->rlci = rlci;
+ if (rlci == rlc->chain.first)
+ cre->is_left = 1;
//}
- //else {
+ // else {
// LANPR_BoundingArea* ch = root->child;
// #define IN_BOUND(ba,rlci)\
// ba.l<=rlci->pos[0] && ba.r>=rlci->pos[0] && ba.b<=rlci->pos[1] &&
ba.u>=rlci->pos[1]
- // if (IN_BOUND(ch[0],rlci))
lanpr_link_point_with_bounding_area_recursive(rb,&ch[0],rlc,rlci);
- // else if(IN_BOUND(ch[1],rlci)) lanpr_link_point_with_bounding_are
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
