[Bf-blender-cvs] [ddd10dbc1b4] temp_lineart_contained: LineArt: Remove modifiers access.

YimingWu noreply at git.blender.org
Thu Nov 12 05:35:46 CET 2020


Commit: ddd10dbc1b45ce9d305d8bde4fa92490bb6ed6f1
Author: YimingWu
Date:   Thu Nov 12 11:28:17 2020 +0800
Branches: temp_lineart_contained
https://developer.blender.org/rBddd10dbc1b45ce9d305d8bde4fa92490bb6ed6f1

LineArt: Remove modifiers access.

===================================================================

M	source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
M	source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
M	source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c

===================================================================

diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
index ad1c8268d36..7f6a4a93562 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
@@ -67,7 +67,7 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-extern LineartSharedResource lineart_share;
+LineartSharedResource lineart_share;
 
 static void initData(GpencilModifierData *md)
 {
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
index 8e942ef0f93..accfc7d4d08 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@ -74,7 +74,7 @@
 
 #include "lineart_intern.h"
 
-LineartSharedResource lineart_share;
+extern LineartSharedResource lineart_share;
 
 /* static function declarations. */
 
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
index 0946ae3885c..b8575de54c1 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
@@ -48,6 +48,8 @@
 
 extern LineartSharedResource lineart_share;
 
+#ifdef LINEART_WITH_BAKE
+
 static int lineart_gpencil_update_strokes_exec(bContext *C, wmOperator *UNUSED(op))
 {
   Depsgraph *dg = CTX_data_depsgraph_pointer(C);
@@ -242,8 +244,10 @@ void SCENE_OT_lineart_bake_strokes(wmOperatorType *ot)
   ot->exec = lineart_gpencil_bake_strokes_exec;
 }
 
+#endif
+
 void ED_operatortypes_lineart(void)
 {
-  WM_operatortype_append(SCENE_OT_lineart_update_strokes);
-  WM_operatortype_append(SCENE_OT_lineart_bake_strokes);
+  // WM_operatortype_append(SCENE_OT_lineart_update_strokes);
+  // WM_operatortype_append(SCENE_OT_lineart_bake_strokes);
 }



More information about the Bf-blender-cvs mailing list