Commit: c2e7ef36d95c9175897f5a6577f95278cb84264d
Author: YimingWu
Date: Sun Jun 23 18:01:07 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBc2e7ef36d95c9175897f5a6577f95278cb84264d
LANPR: make format
===================================================================
M source/blender/blenkernel/BKE_gpencil.h
M source/blender/blenkernel/intern/gpencil.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/draw/engines/lanpr/lanpr_access.c
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_ops.c
M source/blender/modifiers/intern/MOD_mybmesh.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_gpencil.h
b/source/blender/blenkernel/BKE_gpencil.h
index 5b89c8bbadf..25d44ffca55 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -135,7 +135,9 @@ struct bGPDframe *BKE_gpencil_layer_getframe(struct
bGPDlayer *gpl,
struct bGPDframe *BKE_gpencil_layer_find_frame(struct bGPDlayer *gpl, int
cframe);
bool BKE_gpencil_layer_delframe(struct bGPDlayer *gpl, struct bGPDframe *gpf);
-struct bGPDlayer *BKE_gpencil_layer_get_index(struct bGPdata* gpd, int index,
int first_if_not_found);
+struct bGPDlayer *BKE_gpencil_layer_get_index(struct bGPdata *gpd,
+ int index,
+ int first_if_not_found);
struct bGPDlayer *BKE_gpencil_layer_getactive(struct bGPdata *gpd);
void BKE_gpencil_layer_setactive(struct bGPdata *gpd, struct bGPDlayer
*active);
diff --git a/source/blender/blenkernel/intern/gpencil.c
b/source/blender/blenkernel/intern/gpencil.c
index 0295494624a..9acd9d3b447 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -984,9 +984,10 @@ bGPDlayer *BKE_gpencil_layer_getactive(bGPdata *gpd)
return NULL;
}
-bGPDlayer *BKE_gpencil_layer_get_index(bGPdata* gpd, int index, int
first_if_not_found){
+bGPDlayer *BKE_gpencil_layer_get_index(bGPdata *gpd, int index, int
first_if_not_found)
+{
bGPDlayer *gpl;
- int i=0;
+ int i = 0;
/* error checking */
if (ELEM(NULL, gpd, gpd->layers.first)) {
@@ -995,14 +996,14 @@ bGPDlayer *BKE_gpencil_layer_get_index(bGPdata* gpd, int
index, int first_if_not
/* loop over layers until found (assume only one active) */
for (gpl = gpd->layers.first; gpl; gpl = gpl->next) {
- if (i==index) {
+ if (i == index) {
return gpl;
}
i++;
}
/* no such layer */
- if(first_if_not_found){
+ if (first_if_not_found) {
return gpd->layers.first;
}
return NULL;
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index f08e789b695..b22286b978d 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5799,9 +5799,9 @@ static void direct_link_modifiers(FileData *fd, ListBase
*lb)
}
}
else if (md->type == eModifierType_FeatureLine) {
- FeatureLineModifierData *flmd= (FeatureLineModifierData *)md;
+ FeatureLineModifierData *flmd = (FeatureLineModifierData *)md;
- //flmd->target = newdataadr(fd, flmd->target);
+ // flmd->target = newdataadr(fd, flmd->target);
}
}
}
diff --git a/source/blender/blenloader/intern/versioning_280.c
b/source/blender/blenloader/intern/versioning_280.c
index 93f17a0eb02..5d584cc81f9 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -3520,29 +3520,29 @@ void blo_do_versions_280(FileData *fd, Library
*UNUSED(lib), Main *bmain)
}
}
for (Scene *sce = bmain->scenes.first; sce; sce = sce->id.next) {
- sce->lanpr.crease_threshold = 0.7;
+ sce->lanpr.crease_threshold = 0.7;
- sce->lanpr.line_thickness = 1.5;
- sce->lanpr.depth_clamp = 0.001;
- sce->lanpr.depth_strength = 800;
- sce->lanpr.normal_clamp = 2;
- sce->lanpr.normal_strength = 10;
+ sce->lanpr.line_thickness = 1.5;
+ sce->lanpr.depth_clamp = 0.001;
+ sce->lanpr.depth_strength = 800;
+ sce->lanpr.normal_clamp = 2;
+ sce->lanpr.normal_strength = 10;
- sce->lanpr.enable_intersections = 1;
+ sce->lanpr.enable_intersections = 1;
- sce->lanpr.background_color[0] = 0;
- sce->lanpr.background_color[1] = 0;
- sce->lanpr.background_color[2] = 0;
- sce->lanpr.background_color[3] = 1;
+ sce->lanpr.background_color[0] = 0;
+ sce->lanpr.background_color[1] = 0;
+ sce->lanpr.background_color[2] = 0;
+ sce->lanpr.background_color[3] = 1;
- sce->lanpr.line_color[0] = 1;
- sce->lanpr.line_color[1] = 1;
- sce->lanpr.line_color[2] = 1;
- sce->lanpr.line_color[3] = 1;
+ sce->lanpr.line_color[0] = 1;
+ sce->lanpr.line_color[1] = 1;
+ sce->lanpr.line_color[2] = 1;
+ sce->lanpr.line_color[3] = 1;
- sce->lanpr.enable_intersections = 1;
- sce->lanpr.enable_chaining = 1;
- sce->lanpr.chaining_threshold = 0.01;
+ sce->lanpr.enable_intersections = 1;
+ sce->lanpr.enable_chaining = 1;
+ sce->lanpr.chaining_threshold = 0.01;
}
}
diff --git a/source/blender/draw/engines/lanpr/lanpr_access.c
b/source/blender/draw/engines/lanpr/lanpr_access.c
index f8b844b58ba..32e0501c2b8 100644
--- a/source/blender/draw/engines/lanpr/lanpr_access.c
+++ b/source/blender/draw/engines/lanpr/lanpr_access.c
@@ -264,9 +264,11 @@ void lanpr_generate_gpencil_from_chain(
LANPR_RenderLineChainItem *rlci;
for (rlc = rb->chains.first; rlc; rlc = (LANPR_RenderLineChain
*)rlc->item.next) {
- if(!rlc->object_ref) continue; //XXX: intersection lines are lost
-
- if(ob && ob!=rlc->object_ref->id.orig_id) continue;
+ if (!rlc->object_ref)
+ continue; // XXX: intersection lines are lost
+
+ if (ob && ob != rlc->object_ref->id.orig_id)
+ continue;
int array_idx = 0;
int count = lanpr_count_chain(rlc);
diff --git a/source/blender/draw/engines/lanpr/lanpr_chain.c
b/source/blender/draw/engines/lanpr/lanpr_chain.c
index 4ed3d873c20..1e712ac72cf 100644
--- a/source/blender/draw/engines/lanpr/lanpr_chain.c
+++ b/source/blender/draw/engines/lanpr/lanpr_chain.c
@@ -214,7 +214,7 @@ void lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer
*rb)
rlc = lanpr_create_render_line_chain(rb);
- rlc->object_ref = rl->object_ref; // can only be the same object in a
chain.
+ rlc->object_ref = rl->object_ref; // can only be the same object in a
chain.
int r1, r2, c1, c2, row, col;
LANPR_RenderLine *new_rl = rl;
@@ -596,13 +596,14 @@ void lanpr_connect_chains_image_space(LANPR_RenderBuffer
*rb, int do_geometry_sp
rlci = rlc->chain.last;
while (ba = lanpr_get_end_point_bounding_area(rb, rlci)) {
- dist = do_geometry_space?rb->scene->lanpr.chaining_threshold:100.0f;
+ dist = do_geometry_space ? rb->scene->lanpr.chaining_threshold : 100.0f;
closest_cre = NULL;
if (!ba->linked_chains.first)
break;
for (cre = ba->linked_chains.first; cre; cre = next_cre) {
next_cre = (LANPR_ChainRegisterEntry *)cre->item.next;
- if (cre->rlc->object_ref!=rlc) continue;
+ if (cre->rlc->object_ref != rlc)
+ continue;
if (cre->rlc == rlc ||
((LANPR_RenderLineChainItem *)cre->rlc->chain.first)->occlusion !=
occlusion)
continue;
@@ -610,9 +611,8 @@ void lanpr_connect_chains_image_space(LANPR_RenderBuffer
*rb, int do_geometry_sp
BLI_remlink(&ba->linked_chains, cre);
continue;
}
- float new_len = do_geometry_space?
- len_v3v3(cre->rlci->gpos,rlci->gpos):
- len_v2v2(cre->rlci->pos, rlci->pos);
+ float new_len = do_geometry_space ? len_v3v3(cre->rlci->gpos,
rlci->gpos) :
+ len_v2v2(cre->rlci->pos,
rlci->pos);
if (new_len < dist) {
closest_cre = cre;
dist = new_len;
@@ -638,7 +638,7 @@ void lanpr_connect_chains_image_space(LANPR_RenderBuffer
*rb, int do_geometry_sp
rlci = rlc->chain.first;
while (ba = lanpr_get_end_point_bounding_area(rb, rlci)) {
- dist = do_geometry_space?rb->scene->lanpr.chaining_threshold:100.0f;
+ dist = do_geometry_space ? rb->scene->lanpr.chaining_threshold : 100.0f;
closest_cre = NULL;
if (!ba->linked_chains.first)
break;
@@ -651,9 +651,8 @@ void lanpr_connect_chains_image_space(LANPR_RenderBuffer
*rb, int do_geometry_sp
BLI_remlink(&ba->linked_chains, cre);
continue;
}
- float new_len = do_geometry_space?
- len_v3v3(cre->rlci->gpos,rlci->gpos):
- len_v2v2(cre->rlci->pos, rlci->pos);
+ float new_len = do_geometry_space ? len_v3v3(cre->rlci->gpos,
rlci->gpos) :
+ len_v2v2(cre->rlci->pos,
rlci->pos);
if (new_len < dist) {
closest_cre = cre;
dist = new_len;
diff --git a/source/blender/draw/engines/lanpr/lanpr_data_types.h
b/source/blender/draw/engines/lanpr/lanpr_data_types.h
index 7feee82b020..95c1328d81b 100644
--- a/source/blender/draw/engines/lanpr/lanpr_data_types.h
+++ b/source/blender/draw/engines/lanpr/lanpr_data_types.h
@@ -113,7 +113,7 @@ typedef struct LANPR_RenderLine {
// *MaterialRef;
char min_occ;
char flags; // also for line type determination on chainning
-
+
// still need this entry because culled lines will not add to object reln
node
struct Object *object_ref;
@@ -126,7 +126,7 @@ typedef struct LANPR_RenderLineChain {
// int SegmentCount; // we count before draw cmd.
float length; // calculated before draw cmd.
char picked; // used when re-connecting
- struct Object* object_ref;
+ struct Object *object_ref;
} LANPR_RenderLineChain;
typedef struct LANPR_RenderLineChainItem {
diff --git a/source/blender/draw/engines/lanpr/lanpr_ops.c
b/source/blender/draw/engines/lanpr/lanpr_ops.c
index 714bf2c8d34..19b6369db3a 100644
--- a/source/blender/draw/engines/lanpr/lanpr_ops.c
+++ b/source/blender/draw/engines/lanpr/lanpr_ops.c
@@ -4283,17 +4283,18 @@ int lanpr_auto_create_line_layer_exec(struct bContext
*C, struct wmOperator *op)
return OPERATOR_FINISHED;
}
-void lanpr_update_gp_strokes_recursive(Depsgraph *dg, struct Collection *col,
int frame){
+void lanpr_update_gp_strokes_recursive(Depsgraph *dg, struct Collection *col,
int frame)
+{
Object *ob;
Object *gpobj;
ModifierData *md;
bGPdata *gpd;
bGPDlayer *gpl;
bGPDframe *gpf;
- CollectionObject* co;
- CollectionChild* cc;
+ CollectionObject *co;
+ CollectionChild *cc;
- for(co = col->gobject.firs
@@ 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
