[Bf-blender-cvs] [da246ccc503] greasepencil-object: More build fixes for VFX removal
Joshua Leung
noreply at git.blender.org
Tue May 8 17:33:13 CEST 2018
Commit: da246ccc50345806db20115b48cfef38f24d8354
Author: Joshua Leung
Date: Tue May 8 17:33:01 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBda246ccc50345806db20115b48cfef38f24d8354
More build fixes for VFX removal
Still not building, but these should also be safe
===================================================================
M source/blender/draw/CMakeLists.txt
M source/blender/draw/engines/gpencil/gpencil_engine.c
M source/blender/draw/engines/gpencil/gpencil_engine.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesrna/intern/rna_scene.c
===================================================================
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index e82b82fe6a0..28a09515654 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -115,7 +115,6 @@ set(SRC
engines/gpencil/gpencil_cache_utils.c
engines/gpencil/gpencil_draw_cache_impl.c
engines/gpencil/gpencil_geom.c
- engines/gpencil/gpencil_depth_of_field.c
DRW_engine.h
intern/DRW_render.h
@@ -297,8 +296,6 @@ data_to_c_simple(engines/gpencil/shaders/gpencil_paper_frag.glsl SRC)
data_to_c_simple(engines/gpencil/shaders/gpencil_edit_point_vert.glsl SRC)
data_to_c_simple(engines/gpencil/shaders/gpencil_edit_point_geom.glsl SRC)
data_to_c_simple(engines/gpencil/shaders/gpencil_edit_point_frag.glsl SRC)
-data_to_c_simple(engines/gpencil/shaders/gpencil_dof_vert.glsl SRC)
-data_to_c_simple(engines/gpencil/shaders/gpencil_dof_frag.glsl SRC)
list(APPEND INC
)
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 909e5024232..95ffbd6ae87 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -281,10 +281,6 @@ static void GPENCIL_cache_init(void *vedata)
*/
stl->shgroups = MEM_mallocN(sizeof(GPENCIL_shgroup) * GPENCIL_MAX_SHGROUPS, "GPENCIL_shgroup");
}
-
- if (!stl->vfx) {
- stl->vfx = MEM_mallocN(sizeof(GPENCIL_vfx) * GPENCIL_MAX_GP_OBJ, "GPENCIL_vfx");
- }
/* init gp objects cache */
stl->g_data->gp_cache_used = 0;
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h b/source/blender/draw/engines/gpencil/gpencil_engine.h
index 465ba05d86b..d977bf590f9 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.h
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.h
@@ -50,7 +50,6 @@ struct GpencilColorData;
#define GP_SIMPLIFY_ONPLAY(playing) (((playing == true) && (ts->gpencil_simplify & GP_TOOL_FLAG_SIMPLIFY_ON_PLAY)) || ((ts->gpencil_simplify & GP_TOOL_FLAG_SIMPLIFY_ON_PLAY) == 0))
#define GP_SIMPLIFY_FILL(ts, playing) ((GP_SIMPLIFY_ONPLAY(playing) && (GP_SIMPLIFY(ts)) && (ts->gpencil_simplify & GP_TOOL_FLAG_SIMPLIFY_VIEW_FILL)))
#define GP_SIMPLIFY_MODIF(ts, playing) ((GP_SIMPLIFY_ONPLAY(playing) && (GP_SIMPLIFY(ts)) && (ts->gpencil_simplify & GP_TOOL_FLAG_SIMPLIFY_VIEW_MODIF)))
-#define GP_SIMPLIFY_VFX(ts, playing) ((GP_SIMPLIFY_ONPLAY(playing) && (GP_SIMPLIFY(ts)) && (ts->gpencil_simplify & GP_TOOL_FLAG_SIMPLIFY_VIEW_VFX)))
#define GP_IS_CAMERAVIEW ((rv3d != NULL) && (rv3d->persp == RV3D_CAMOB && v3d->camera))
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 9836d8dcc68..acfa4874061 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1960,8 +1960,6 @@ typedef enum eGPencil_SimplifyFlags {
GP_TOOL_FLAG_SIMPLIFY_VIEW_FILL = (1 << 2),
/* Simplify modifier on viewport */
GP_TOOL_FLAG_SIMPLIFY_VIEW_MODIF = (1 << 3),
- /* Simplify vfx modifier on viewport */
- GP_TOOL_FLAG_SIMPLIFY_VIEW_VFX = (1 << 4),
/* Remove fill external line */
GP_TOOL_FLAG_SIMPLIFY_REMOVE_LINE = (1 << 8),
/* Disable fast drawing */
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 8aa2d86393a..92199e32875 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -2451,11 +2451,6 @@ static void rna_def_tool_settings(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Fill", "Do not apply modifiers on viewport");
RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
- prop = RNA_def_property(srna, "gpencil_simplify_view_vfx", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "gpencil_simplify", GP_TOOL_FLAG_SIMPLIFY_VIEW_VFX);
- RNA_def_property_ui_text(prop, "Fill", "Do not apply VFX modifiers on viewport");
- RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
-
prop = RNA_def_property(srna, "gpencil_disable_fast_drawing", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "gpencil_simplify", GP_TOOL_FLAG_DISABLE_FAST_DRAWING);
RNA_def_property_ui_text(prop, "Disable Fast Drawing", "Disable fast drawing while painting");
More information about the Bf-blender-cvs
mailing list