[Bf-blender-cvs] [77e2f9629d1] lanpr-under-gp: LineArt: Cleanup extra modifications caused by merging and stuff.
YimingWu
noreply at git.blender.org
Mon Aug 3 15:27:22 CEST 2020
Commit: 77e2f9629d10dc576877f3c522779e5aac8eec9e
Author: YimingWu
Date: Mon Aug 3 21:26:49 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB77e2f9629d10dc576877f3c522779e5aac8eec9e
LineArt: Cleanup extra modifications caused by merging and stuff.
===================================================================
M build_files/cmake/config/blender_full.cmake
M build_files/cmake/config/blender_release.cmake
M release/scripts/startup/bl_ui/properties_render.py
M source/blender/blenkernel/intern/object.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/draw/intern/DRW_render.h
M source/blender/draw/intern/draw_manager_texture.c
M source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
M source/blender/makesdna/DNA_collection_types.h
M source/blender/makesdna/DNA_object_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesrna/intern/rna_object.c
===================================================================
diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake
index 449647ea947..3637dc26f15 100644
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@ -20,7 +20,7 @@ set(WITH_LIBMV ON CACHE BOOL "" FORCE)
set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE)
set(WITH_COMPOSITOR ON CACHE BOOL "" FORCE)
set(WITH_FREESTYLE ON CACHE BOOL "" FORCE)
-set(WITH_LINEART ON CACHE BOOL "" FORCE)
+set(WITH_LINEART ON CACHE BOOL "" FORCE)
set(WITH_IK_SOLVER ON CACHE BOOL "" FORCE)
set(WITH_IK_ITASC ON CACHE BOOL "" FORCE)
set(WITH_IMAGE_CINEON ON CACHE BOOL "" FORCE)
diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake
index 0a766823eb8..c9538dfa721 100644
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@ -21,7 +21,7 @@ set(WITH_LIBMV ON CACHE BOOL "" FORCE)
set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE)
set(WITH_COMPOSITOR ON CACHE BOOL "" FORCE)
set(WITH_FREESTYLE ON CACHE BOOL "" FORCE)
-set(WITH_LINEART ON CACHE BOOL "" FORCE)
+set(WITH_LINEART ON CACHE BOOL "" FORCE)
set(WITH_IK_SOLVER ON CACHE BOOL "" FORCE)
set(WITH_IK_ITASC ON CACHE BOOL "" FORCE)
set(WITH_IMAGE_CINEON ON CACHE BOOL "" FORCE)
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index efc222cc93d..318deb8093e 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -18,15 +18,12 @@
# ##### END GPL LICENSE BLOCK #####
# <pep8 compliant>
+from bpy.types import Panel
from bl_ui.space_view3d import (
VIEW3D_PT_shading_lighting,
VIEW3D_PT_shading_color,
VIEW3D_PT_shading_options,
)
-from bpy.types import (
- Panel,
- UIList,
-)
from bl_ui.properties_grease_pencil_common import GreasePencilSimplifyPanel
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 15dac50ee30..fe559d2a44e 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -522,8 +522,6 @@ static void object_foreach_id(ID *id, LibraryForeachIDData *data)
BKE_LIB_FOREACHID_PROCESS(data, object->soft->effector_weights->group, IDWALK_CB_NOP);
}
}
-
- BKE_LIB_FOREACHID_PROCESS(data, object->lineart.target, IDWALK_CB_NOP);
}
IDTypeInfo IDType_ID_OB = {
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 5058ca125f8..dac69d67a25 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6240,36 +6240,6 @@ static void lib_link_scene(BlendLibReader *reader, Scene *sce)
}
}
- if (sce->rigidbody_world) {
- RigidBodyWorld *rbw = sce->rigidbody_world;
- if (rbw->group) {
- BLO_read_id_address(reader, sce->id.lib, &rbw->group);
- }
- if (rbw->constraints) {
- BLO_read_id_address(reader, sce->id.lib, &rbw->constraints);
- }
- if (rbw->effector_weights) {
- BLO_read_id_address(reader, sce->id.lib, &rbw->effector_weights->group);
- }
- }
-
- if (sce->nodetree) {
- composite_patch(sce->nodetree, sce);
- }
-
- for (SceneRenderLayer *srl = sce->r.layers.first; srl; srl = srl->next) {
- BLO_read_id_address(reader, sce->id.lib, &srl->mat_override);
- for (FreestyleModuleConfig *fmc = srl->freestyleConfig.modules.first; fmc; fmc = fmc->next) {
- BLO_read_id_address(reader, sce->id.lib, &fmc->script);
- }
- for (FreestyleLineSet *fls = srl->freestyleConfig.linesets.first; fls; fls = fls->next) {
- BLO_read_id_address(reader, sce->id.lib, &fls->linestyle);
- BLO_read_id_address(reader, sce->id.lib, &fls->group);
- }
- }
-
- /* Motion Tracking */
- BLO_read_id_address(reader, sce->id.lib, &sce->clip);
if (sce->nodetree) {
composite_patch(sce->nodetree, sce);
}
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index c43aeee0eb4..8db9f9084b8 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -5121,4 +5121,4 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
/* Keep this block, even when empty. */
}
-}
\ No newline at end of file
+}
diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index dc9f8c8ebed..3551296cfc3 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -175,17 +175,6 @@ void DRW_texture_ensure_fullscreen_2d(struct GPUTexture **tex,
void DRW_texture_ensure_2d(
struct GPUTexture **tex, int w, int h, eGPUTextureFormat format, DRWTextureFlag flags);
-void DRW_texture_ensure_fullscreen_2D_multisample(struct GPUTexture **tex,
- eGPUTextureFormat format,
- int samples,
- DRWTextureFlag flags);
-void DRW_texture_ensure_2D_multisample(struct GPUTexture **tex,
- int w,
- int h,
- eGPUTextureFormat format,
- int samples,
- DRWTextureFlag flags);
-
void DRW_texture_generate_mipmaps(struct GPUTexture *tex);
void DRW_texture_free(struct GPUTexture *tex);
#define DRW_TEXTURE_FREE_SAFE(tex) \
diff --git a/source/blender/draw/intern/draw_manager_texture.c b/source/blender/draw/intern/draw_manager_texture.c
index 0cb6535b1c1..77b0462303d 100644
--- a/source/blender/draw/intern/draw_manager_texture.c
+++ b/source/blender/draw/intern/draw_manager_texture.c
@@ -168,30 +168,6 @@ void DRW_texture_ensure_2d(
}
}
-void DRW_texture_ensure_fullscreen_2D_multisample(GPUTexture **tex,
- eGPUTextureFormat format,
- int samples,
- DRWTextureFlag UNUSED(flags))
-{
- if (*(tex) == NULL) {
- const float *size = DRW_viewport_size_get();
- *(tex) = GPU_texture_create_2d_multisample(
- (int)size[0], (int)size[1], format, NULL, samples, NULL);
- }
-}
-
-void DRW_texture_ensure_2D_multisample(GPUTexture **tex,
- int w,
- int h,
- eGPUTextureFormat format,
- int samples,
- DRWTextureFlag UNUSED(flags))
-{
- if (*(tex) == NULL) {
- *(tex) = GPU_texture_create_2d_multisample(w, h, format, NULL, samples, NULL);
- }
-}
-
void DRW_texture_generate_mipmaps(GPUTexture *tex)
{
GPU_texture_bind(tex, 0);
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
index 1b41715bb9d..01b472678ab 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
@@ -264,7 +264,7 @@ static void updateDepsgraph(GpencilModifierData *md,
else {
FOREACH_COLLECTION_VISIBLE_OBJECT_RECURSIVE_BEGIN (ctx->scene->master_collection, ob, mode) {
if (ob->type == OB_MESH) {
- if (!(ob->lineart.flags & COLLECTION_LRT_EXCLUDE)) {
+ if (!(ob->lineart.usage & COLLECTION_LRT_EXCLUDE)) {
DEG_add_object_relation(ctx->node, ob, DEG_OB_COMP_GEOMETRY, "Line Art Modifier");
DEG_add_object_relation(ctx->node, ob, DEG_OB_COMP_TRANSFORM, "Line Art Modifier");
}
diff --git a/source/blender/makesdna/DNA_collection_types.h b/source/blender/makesdna/DNA_collection_types.h
index 2caf8cfb821..cad2722ae7e 100644
--- a/source/blender/makesdna/DNA_collection_types.h
+++ b/source/blender/makesdna/DNA_collection_types.h
@@ -89,12 +89,12 @@ typedef struct Collection {
/* Collection->flag */
enum {
- COLLECTION_RESTRICT_VIEWPORT = (1 << 0), /* Disable in viewports. */
- COLLECTION_RESTRICT_SELECT = (1 << 1), /* Not selectable in viewport. */
- COLLECTION_DISABLED_DEPRECATED = (1 << 2), /* Not used anymore */
- COLLECTION_RESTRICT_RENDER = (1 << 3), /* Disable in renders. */
- COLLECTION_HAS_OBJECT_CACHE = (1 << 4), /* Runtime: object_cache is populated. */
- COLLECTION_IS_MASTER = (1 << 5), /* Is master collection embedded in the scene. */
+ COLLECTION_RESTRICT_VIEWPORT = (1 << 0), /* Disable in viewports. */
+ COLLECTION_RESTRICT_SELECT = (1 << 1), /* Not selectable in viewport. */
+ /* COLLECTION_DISABLED_DEPRECATED = (1 << 2), */ /* Not used anymore */
+ COLLECTION_RESTRICT_RENDER = (1 << 3), /* Disable in renders. */
+ COLLECTION_HAS_OBJECT_CACHE = (1 << 4), /* Runtime: object_cache is populated. */
+ COLLECTION_IS_MASTER = (1 << 5), /* Is master collection embedded in the scene. */
};
/* Collection->tag */
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 78fd7ed6dcc..025df8eb5fe 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -196,31 +196,9 @@ typedef struct Object_Runtime {
short _pad2[3];
} Object_Runtime;
-typedef struct ObjectLineartLineType {
- int use;
- char _pad[4];
- char target_layer[128];
- char target_material[128];
-} ObjectLineartLineType;
-
typedef struct ObjectLineart {
int usage;
-
- /* Separate flags for Line Art shared flag values. */
- int flags;
-
- struct Object *target;
- char target_layer[128];
- char target_material[128];
-
- ObjectLineartLineType crease;
- ObjectLineartLineType contour;
- ObjectLineartLineType mater
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list