[Bf-blender-cvs] [d4561c2468a] temp-lanpr-staging: Cleanup: Make format.
YimingWu
noreply at git.blender.org
Wed Sep 4 09:16:49 CEST 2019
Commit: d4561c2468a77147a41898004c9aeb0ff7955c36
Author: YimingWu
Date: Wed Sep 4 15:10:22 2019 +0800
Branches: temp-lanpr-staging
https://developer.blender.org/rBd4561c2468a77147a41898004c9aeb0ff7955c36
Cleanup: Make format.
===================================================================
M source/blender/draw/engines/lanpr/lanpr_chain_draw.c
M source/blender/draw/engines/lanpr/lanpr_cpu.c
M source/blender/draw/engines/lanpr/lanpr_dpix.c
M source/blender/draw/engines/lanpr/lanpr_engine.c
M source/blender/editors/lanpr/lanpr_ops.c
M source/blender/editors/lanpr/lanpr_util.c
M source/blender/makesrna/intern/rna_collection.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/makesrna/intern/rna_object.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/modifiers/CMakeLists.txt
===================================================================
diff --git a/source/blender/draw/engines/lanpr/lanpr_chain_draw.c b/source/blender/draw/engines/lanpr/lanpr_chain_draw.c
index ec7fca1b797..f036a8940a4 100644
--- a/source/blender/draw/engines/lanpr/lanpr_chain_draw.c
+++ b/source/blender/draw/engines/lanpr/lanpr_chain_draw.c
@@ -38,7 +38,6 @@
#include "DRW_engine.h"
#include "DRW_render.h"
-
#include "GPU_batch.h"
#include "GPU_draw.h"
#include "GPU_framebuffer.h"
diff --git a/source/blender/draw/engines/lanpr/lanpr_cpu.c b/source/blender/draw/engines/lanpr/lanpr_cpu.c
index 8043e50cc7e..2f02fa64cbb 100644
--- a/source/blender/draw/engines/lanpr/lanpr_cpu.c
+++ b/source/blender/draw/engines/lanpr/lanpr_cpu.c
@@ -349,11 +349,9 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
1);
DRW_shgroup_uniform_int(rb->ChainShgrp, "use_contour", &ll->contour.use, 1);
DRW_shgroup_uniform_int(rb->ChainShgrp, "use_crease", &ll->crease.use, 1);
- DRW_shgroup_uniform_int(
- rb->ChainShgrp, "use_material", &ll->material_separate.use, 1);
+ DRW_shgroup_uniform_int(rb->ChainShgrp, "use_material", &ll->material_separate.use, 1);
DRW_shgroup_uniform_int(rb->ChainShgrp, "use_edge_mark", &ll->edge_mark.use, 1);
- DRW_shgroup_uniform_int(
- rb->ChainShgrp, "use_intersection", &ll->intersection.use, 1);
+ DRW_shgroup_uniform_int(rb->ChainShgrp, "use_intersection", &ll->intersection.use, 1);
static int normal_effect_inverse;
normal_effect_inverse = (ll->flags & LANPR_LINE_LAYER_NORMAL_INVERSE) ? 1 : 0;
diff --git a/source/blender/draw/engines/lanpr/lanpr_dpix.c b/source/blender/draw/engines/lanpr/lanpr_dpix.c
index 6f7c8bfbc96..7ebb28d2b2e 100644
--- a/source/blender/draw/engines/lanpr/lanpr_dpix.c
+++ b/source/blender/draw/engines/lanpr/lanpr_dpix.c
@@ -38,7 +38,6 @@
#include "DRW_engine.h"
#include "DRW_render.h"
-
#include "GPU_batch.h"
#include "GPU_draw.h"
#include "GPU_framebuffer.h"
diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c
index d011e4ba76b..295e1f12411 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -21,8 +21,6 @@
* \ingroup draw
*/
-
-
#include "BLI_listbase.h"
#include "BLI_linklist.h"
#include "BLI_math_matrix.h"
@@ -315,10 +313,8 @@ static void lanpr_cache_init(void *vedata)
"crease_fade_threshold",
&lanpr->crease_fade_threshold,
1);
- DRW_shgroup_uniform_int(
- stl->g_data->dpix_transform_shgrp, "use_contour", &ll->contour.use, 1);
- DRW_shgroup_uniform_int(
- stl->g_data->dpix_transform_shgrp, "use_crease", &ll->crease.use, 1);
+ DRW_shgroup_uniform_int(stl->g_data->dpix_transform_shgrp, "use_contour", &ll->contour.use, 1);
+ DRW_shgroup_uniform_int(stl->g_data->dpix_transform_shgrp, "use_crease", &ll->crease.use, 1);
DRW_shgroup_uniform_int(
stl->g_data->dpix_transform_shgrp, "use_material", &ll->material_separate.use, 1);
DRW_shgroup_uniform_int(
diff --git a/source/blender/editors/lanpr/lanpr_ops.c b/source/blender/editors/lanpr/lanpr_ops.c
index f754409d45f..f5b23022c5b 100644
--- a/source/blender/editors/lanpr/lanpr_ops.c
+++ b/source/blender/editors/lanpr/lanpr_ops.c
@@ -21,7 +21,6 @@
* \ingroup editors
*/
-
#include <stdlib.h>
#include "BLI_utildefines.h"
diff --git a/source/blender/editors/lanpr/lanpr_util.c b/source/blender/editors/lanpr/lanpr_util.c
index 303e1f0035c..ac1735c2491 100644
--- a/source/blender/editors/lanpr/lanpr_util.c
+++ b/source/blender/editors/lanpr/lanpr_util.c
@@ -21,7 +21,6 @@
* \ingroup editors
*/
-
#include <stdlib.h>
#include <stdio.h>
/* #include <time.h> */
diff --git a/source/blender/makesrna/intern/rna_collection.c b/source/blender/makesrna/intern/rna_collection.c
index 8dd1910787c..e438cf1f491 100644
--- a/source/blender/makesrna/intern/rna_collection.c
+++ b/source/blender/makesrna/intern/rna_collection.c
@@ -371,7 +371,11 @@ static void rna_def_collection_lanpr(BlenderRNA *brna, StructRNA *srna)
static const EnumPropertyItem rna_collection_lanpr_usage[] = {
{COLLECTION_LANPR_INCLUDE, "INCLUDE", 0, "Include", "Collection will produce feature lines"},
- {COLLECTION_LANPR_OCCLUSION_ONLY, "OCCLUSION_ONLY", 0, "Occlusion Only", "Only use the collection to produce occlusion"},
+ {COLLECTION_LANPR_OCCLUSION_ONLY,
+ "OCCLUSION_ONLY",
+ 0,
+ "Occlusion Only",
+ "Only use the collection to produce occlusion"},
{COLLECTION_LANPR_EXCLUDE, "EXCLUDE", 0, "Exclude", "Don't use this collection in LANPR"},
{0, NULL, 0, NULL, NULL}};
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index bc70bee3172..8473d48269a 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -6020,7 +6020,7 @@ static void rna_def_modifier_featureline(BlenderRNA *brna)
prop = RNA_def_property(srna, "enable_mark", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "types", MOD_FEATURE_LINE_MARK);
- RNA_def_property_ui_text(prop, "Mark","Marked NPR edges");
+ RNA_def_property_ui_text(prop, "Mark", "Marked NPR edges");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "use_material", PROP_BOOLEAN, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index c9061c7c087..09007acbbfd 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -2354,16 +2354,20 @@ static void rna_def_object_lanpr(BlenderRNA *brna)
static EnumPropertyItem prop_feature_line_usage_items[] = {
{OBJECT_FEATURE_LINE_INHERENT,
- "INHERENT",
+ "INHEREIT",
0,
- "Inherent",
+ "Inhereit",
"Follow settings from the parent collection"},
{OBJECT_FEATURE_LINE_OCCLUSION_ONLY,
"OCCLUSION_ONLY",
0,
"Occlusion Only",
"Don't produce lines, only used as occlusion object"},
- {OBJECT_FEATURE_LINE_EXCLUDE, "EXCLUDE", 0, "Exclude", "Don't calculate this object"},
+ {OBJECT_FEATURE_LINE_EXCLUDE,
+ "EXCLUDE",
+ 0,
+ "Exclude",
+ "Don't use this object for LANPR rendering"},
{0, NULL, 0, NULL, NULL},
};
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index a95038fb745..066a45072da 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -7269,32 +7269,6 @@ static void rna_def_scene_lanpr(BlenderRNA *brna)
tracing"}, */
{0, NULL, 0, NULL, NULL}};
- static const EnumPropertyItem rna_enum_lanpr_enable_post_processing[] = {
- {LANPR_POST_PROCESSING_DISABLED,
- "DISABLED",
- 0,
- "Disabled",
- "LANPR does not compute anything"},
- {LANPR_POST_PROCESSING_ENABLED,
- "ENABLED",
- 0,
- "Enabled",
- "LANPR will compute feature lines in image post processing"},
- {0, NULL, 0, NULL, NULL}};
-
- static const EnumPropertyItem rna_enum_lanpr_display_thinning_result[] = {
- {LANPR_POST_PROCESSING_DISABLED,
- "DISABLED",
- 0,
- "Edge Detection",
- "Display edge detector result"},
- {LANPR_POST_PROCESSING_ENABLED,
- "ENABLED",
- 0,
- "Thinning",
- "Apply thinning filters for vector usage"},
- {0, NULL, 0, NULL, NULL}};
-
static const EnumPropertyItem rna_enum_lanpr_use_same_taper[] = {
{LANPR_USE_DIFFERENT_TAPER, "DISABLED", 0, "Different", "Use different taper value"},
{LANPR_USE_SAME_TAPER,
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index 827630e7cc3..f236604d491 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -39,74 +39,74 @@ set(INC_SYS
)
set(SRC
- intern/MOD_armature.c
- intern/MOD_array.c
- intern/MOD_bevel.c
- intern/MOD_boolean.c
- intern/MOD_build.c
- intern/MOD_cast.c
- intern/MOD_cloth.c
- intern/MOD_collision.c
- intern/MOD_correctivesmooth.c
- intern/MOD_curve.c
- intern/MOD_datatransfer.c
- intern/MOD_decimate.c
- intern/MOD_displace.c
- intern/MOD_dynamicpaint.c
- intern/MOD_edgesplit.c
- intern/MOD_explode.c
- intern/MOD_fluidsim.c
- intern/MOD_fluidsim_util.c
- intern/MOD_featureline.c
- intern/MOD_hook.c
- intern/MOD_laplaciandeform.c
- intern/MOD_laplaciansmooth.c
- intern/MOD_lattice.c
- intern/MOD_mask.c
- intern/MOD_meshcache.c
- intern/MOD_meshcache_mdd.c
- intern/MOD_meshcache_pc2.c
- intern/MOD_meshcache_util.c
- intern/MOD_meshdeform.c
- intern/MOD_meshsequencecache.c
- intern/MOD_mirror.c
- intern/MOD_multires.c
- intern/MOD_none.c
- intern/MOD_normal_edit.c
- intern/MOD_ocean.c
- intern/MOD_particleinstance.c
- intern/MOD_particlesystem.c
- intern/MOD_remesh.c
- intern/MOD_screw.c
- intern/MOD_shapekey.c
- intern/MOD_shrinkwrap.c
- intern/MOD_simpledeform.c
- intern/MOD_skin.c
- intern/MOD_smoke.c
- intern/MOD_smooth.c
- intern/MOD_softbody.c
- intern/MOD_solidify.c
- intern/MOD_subsurf.c
- intern/MOD_surface.c
- intern/MOD_surfacedeform.c
- intern/MOD_triangulate.c
- intern/MOD_util.c
- intern/MOD_uvproject.c
- intern/MOD_uvwarp.c
- intern/MOD_warp.c
- intern/MOD_wave.c
- intern/MOD_weighted_normal.c
- intern/MOD_weightvg_util.c
- intern/MOD_weightvgedit.c
- intern/MOD_weightvgmix.c
- intern/MOD_weightvgproximity.c
- intern/MOD_wireframe.c
-
- MOD_modifiertypes.h
- intern/MOD_fluidsim_util.h
- intern/MOD_meshcache_util.h
- intern/MOD_util.h
- intern/MOD_weightvg_util.h
+ intern/MOD_armature.c
+ intern/MOD_array.c
+ intern/MOD_bevel.c
+ intern/MOD_boolean.c
+ intern/MOD_build.c
+ intern/MOD_cast.c
+ intern/MOD_cloth.c
+ intern/MOD_collision.c
+ intern/MOD_correctivesmooth.c
+ intern/MOD_curve.c
+ intern/MOD_datatransfer.c
+ intern/MOD_decimate.c
+ intern/MOD_displace.c
+ intern/MOD_dynamicpaint.c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list