[Bf-blender-cvs] [af0378aa4aa] temp-lanpr-staging: Cleanup: Make format.
YimingWu
noreply at git.blender.org
Thu Sep 12 09:06:21 CEST 2019
Commit: af0378aa4aacd0c9fdf9cc3523947b0ce34eea42
Author: YimingWu
Date: Thu Sep 12 15:06:03 2019 +0800
Branches: temp-lanpr-staging
https://developer.blender.org/rBaf0378aa4aacd0c9fdf9cc3523947b0ce34eea42
Cleanup: Make format.
===================================================================
M intern/cycles/render/film.h
M source/blender/blenkernel/BKE_gpencil.h
M source/blender/blenkernel/intern/gpencil.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/writefile.c
M source/blender/editors/lanpr/lanpr_cpu.c
M source/blender/makesdna/DNA_collection_types.h
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesdna/DNA_object_types.h
M source/blender/makesrna/intern/rna_collection.c
M source/blender/makesrna/intern/rna_object.c
===================================================================
diff --git a/intern/cycles/render/film.h b/intern/cycles/render/film.h
index 20f6261a871..2c4e07d60ae 100644
--- a/intern/cycles/render/film.h
+++ b/intern/cycles/render/film.h
@@ -91,7 +91,7 @@ class Film : public Node {
void device_free(Device *device, DeviceScene *dscene, Scene *scene);
bool modified(const Film &film);
- void tag_passes_update(Scene *scene, const vector<Pass> &passes_, bool update_passes=true);
+ void tag_passes_update(Scene *scene, const vector<Pass> &passes_, bool update_passes = true);
void tag_update(Scene *scene);
};
diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h
index 18194345b83..df37a31cdd7 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -150,8 +150,8 @@ 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_by_name(struct bGPdata *gpd,
- char* name,
- int first_if_not_found);
+ char *name,
+ 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);
@@ -178,7 +178,7 @@ struct Material *BKE_gpencil_object_material_new(struct Main *bmain,
int BKE_gpencil_object_material_get_index(struct Object *ob, struct Material *ma);
-int BKE_gpencil_object_material_get_index_name(struct Object *ob, char* name);
+int BKE_gpencil_object_material_get_index_name(struct Object *ob, char *name);
struct Material *BKE_gpencil_object_material_get_from_brush(struct Object *ob,
struct Brush *brush);
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index f14fca691d0..1a92e67a035 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -991,7 +991,7 @@ bGPDlayer *BKE_gpencil_layer_getactive(bGPdata *gpd)
return NULL;
}
-bGPDlayer *BKE_gpencil_layer_get_by_name(bGPdata *gpd, char* name, int first_if_not_found)
+bGPDlayer *BKE_gpencil_layer_get_by_name(bGPdata *gpd, char *name, int first_if_not_found)
{
bGPDlayer *gpl;
int i = 0;
@@ -1003,7 +1003,7 @@ bGPDlayer *BKE_gpencil_layer_get_by_name(bGPdata *gpd, char* name, int first_if_
/* loop over layers until found (assume only one active) */
for (gpl = gpd->layers.first; gpl; gpl = gpl->next) {
- if (STREQ(name,gpl->info)) {
+ if (STREQ(name, gpl->info)) {
return gpl;
}
i++;
@@ -2150,14 +2150,14 @@ int BKE_gpencil_object_material_get_index(Object *ob, Material *ma)
return -1;
}
-int BKE_gpencil_object_material_get_index_name(Object *ob, char* name)
+int BKE_gpencil_object_material_get_index_name(Object *ob, char *name)
{
short *totcol = give_totcolp(ob);
Material *read_ma = NULL;
for (short i = 0; i < *totcol; i++) {
read_ma = give_current_material(ob, i + 1);
/* Material names are like "MAMaterial.001" */
- if (STREQ(name,&read_ma->id.name[2])) {
+ if (STREQ(name, &read_ma->id.name[2])) {
return i;
}
}
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 6514f6f572b..f2956fdf40a 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -791,7 +791,6 @@ void BKE_scene_init(Scene *sce)
sce->lanpr.flags |= (LANPR_USE_CHAINING | LANPR_USE_INTERSECTIONS);
sce->lanpr.chaining_image_threshold = 0.01;
sce->lanpr.chaining_geometry_threshold = 0.1;
-
}
Scene *BKE_scene_add(Main *bmain, const char *name)
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index d2924c7e190..f05deb54a6a 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7022,7 +7022,7 @@ static void direct_link_scene(FileData *fd, Scene *sce)
ll->shgrp = NULL;
// ll->normal_control_object = newlibadr(fd, sce->id.lib, ll->normal_control_object);
}
-
+
direct_link_view3dshading(fd, &sce->display.shading);
sce->layer_properties = newdataadr(fd, sce->layer_properties);
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index fc846830718..a6bc44aac77 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2699,7 +2699,7 @@ static void write_scene(WriteData *wd, Scene *sce)
writestruct(wd, DATA, LANPR_LineLayerComponent, 1, llc);
}
}
-
+
write_view3dshading(wd, &sce->display.shading);
/* Freed on doversion. */
diff --git a/source/blender/editors/lanpr/lanpr_cpu.c b/source/blender/editors/lanpr/lanpr_cpu.c
index fb9526ea200..2caadc66f49 100644
--- a/source/blender/editors/lanpr/lanpr_cpu.c
+++ b/source/blender/editors/lanpr/lanpr_cpu.c
@@ -1741,7 +1741,7 @@ static void lanpr_make_render_geometry_buffers_object(
static int lanpr_object_has_feature_line_modifier(Object *o)
{
- if(o->lanpr.usage==OBJECT_FEATURE_LINE_INCLUDE){
+ if (o->lanpr.usage == OBJECT_FEATURE_LINE_INCLUDE) {
return 1;
}
return 0;
@@ -1753,7 +1753,8 @@ int ED_lanpr_object_collection_usage_check(Collection *c, Object *o)
int object_is_used = (lanpr_object_has_feature_line_modifier(o) &&
o->lanpr.usage == OBJECT_FEATURE_LINE_INHERENT);
- if (object_is_used && (c->lanpr.flags&LANPR_LINE_LAYER_COLLECTION_FORCE) && c->lanpr.usage != COLLECTION_FEATURE_LINE_INCLUDE) {
+ if (object_is_used && (c->lanpr.flags & LANPR_LINE_LAYER_COLLECTION_FORCE) &&
+ c->lanpr.usage != COLLECTION_FEATURE_LINE_INCLUDE) {
if (BKE_collection_has_object_recursive(c, o)) {
if (c->lanpr.usage == COLLECTION_FEATURE_LINE_EXCLUDE) {
return OBJECT_FEATURE_LINE_EXCLUDE;
@@ -2296,12 +2297,12 @@ static LANPR_RenderLine *lanpr_triangle_generate_intersection_line_only(
LANPR_RenderVert *TE1 = 0;
LANPR_RenderVert *TE2 = 0;
tnsVector3d cl; /* rb->scene->ActiveCamera->gloc; */
- real ZMax = ((Camera *)rb->scene->camera->data)->clip_end;
- real ZMin = ((Camera *)rb->scene->camera->data)->clip_start;
+ real ZMax = ((Camera *)rb->camera->data)->clip_end;
+ real ZMin = ((Camera *)rb->camera->data)->clip_start;
LANPR_RenderVert *Share = lanpr_triangle_share_point(testing, rt);
- Camera *cam = rb->scene->camera->data;
+ Camera *cam = rb->camera->data;
- copy_v3db_v3fl(cl, rb->scene->camera->obmat[3]);
+ copy_v3db_v3fl(cl, rb->camera->obmat[3]);
if (Share) {
LANPR_RenderVert *NewShare;
@@ -2694,8 +2695,8 @@ static int lanpr_max_occlusion_in_targets(Depsgraph *depsgraph)
o,
DEG_ITER_OBJECT_FLAG_LINKED_DIRECTLY | DEG_ITER_OBJECT_FLAG_VISIBLE |
DEG_ITER_OBJECT_FLAG_DUPLI | DEG_ITER_OBJECT_FLAG_LINKED_VIA_SET) {
-
- ObjectLANPR* obl = &o->lanpr;
+
+ ObjectLANPR *obl = &o->lanpr;
if (obl->target) {
if (obl->flags & LANPR_LINE_LAYER_USE_MULTIPLE_LEVELS) {
max = MAX2(obl->level_start, obl->level_end);
@@ -3776,6 +3777,7 @@ int ED_lanpr_compute_feature_lines_internal(Depsgraph *depsgraph, int intersecto
lanpr_share.render_buffer_shared = rb;
rb->scene = s;
+ rb->camera = s->camera;
rb->w = s->r.xsch;
rb->h = s->r.ysch;
rb->use_intersections = (lanpr->flags & LANPR_USE_INTERSECTIONS);
@@ -3948,19 +3950,20 @@ bool ED_lanpr_dpix_shader_error()
/* Grease Pencil bindings */
/* returns flags from LANPR_EdgeFlag */
-static int lanpr_object_line_types(Object* ob){
- ObjectLANPR* obl = &ob->lanpr;
- int result=0;
- if(obl->contour.use){
+static int lanpr_object_line_types(Object *ob)
+{
+ ObjectLANPR *obl = &ob->lanpr;
+ int result = 0;
+ if (obl->contour.use) {
result |= LANPR_EDGE_FLAG_CONTOUR;
}
- if(obl->crease.use){
+ if (obl->crease.use) {
result |= LANPR_EDGE_FLAG_CREASE;
}
- if(obl->material.use){
+ if (obl->material.use) {
result |= LANPR_EDGE_FLAG_MATERIAL;
}
- if(obl->edge_mark.use){
+ if (obl->edge_mark.use) {
result |= LANPR_EDGE_FLAG_EDGE_MARK;
}
return result;
@@ -4062,15 +4065,16 @@ static void lanpr_clear_gp_lanpr_flags(Depsgraph *dg, int frame)
DEG_OBJECT_ITER_END;
}
static void lanpr_update_gp_strokes_single(Depsgraph *dg,
- Object* gpobj,
- Object *ob,
- int frame,
- int level_start,
- int level_end,
- char* target_layer,
- char* target_material,
- Collection* col,
- int type){
+ Object *gpobj,
+ Object *ob,
+ int frame,
+ int level_start,
+ int level_end,
+ char *target_layer,
+ char *target_material,
+ Collection *col,
+ int type)
+{
bGPdata *gpd;
bGPDlayer *gpl;
bGPDframe *gpf;
@@ -4091,13 +4095,14 @@ static void lanpr_update_gp_strokes_single(Depsgraph *dg,
BKE_gpencil_free_strokes(gpf);
gpf->flag |= GP_FRAME_LANPR_CLEARED;
}
-
+
int use_material = BKE_gpencil_object_material_get_index_name(gpobj, target_material);
- if (use_material<0){
+ if (use_material < 0) {
use_material = 0;
}
- lanpr_generate_gpencil_from_chain(dg, ob, gpl, gpf, level_start, level_en
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list