source/blender/draw/engines/gpencil/gpencil_antialiasing.hh

@@ -19,7 +19,7 @@
 
 #include "BLI_smaa_textures.h"
 
-namespace blender::greasepencil {
+namespace blender::draw::greasepencil {
 
 using namespace draw;
 
@@ -154,4 +154,4 @@ class AntiAliasing {
   }
 };
 
-}  // namespace blender::greasepencil
+}  // namespace blender::draw::greasepencil

source/blender/draw/engines/gpencil/gpencil_engine.cc

@@ -31,7 +31,7 @@
 #include "gpencil_shader_shared.h"
 #include "gpencil_vfx.hh"
 
-namespace blender::greasepencil {
+namespace blender::draw::greasepencil {
 
 using namespace draw;
 
@@ -192,7 +192,7 @@ class Instance {
   }
 };
 
-}  // namespace blender::greasepencil
+}  // namespace blender::draw::greasepencil
 
 /* -------------------------------------------------------------------- */
 /** \name Interface with legacy C DRW manager
@@ -206,7 +206,7 @@ struct GPENCIL_NEXT_Data {
   DRWViewportEmptyList *txl;
   DRWViewportEmptyList *psl;
   DRWViewportEmptyList *stl;
-  greasepencil::Instance *instance;
+  draw::greasepencil::Instance *instance;
 
   char info[GPU_INFO_SIZE];
 };
@@ -220,7 +220,7 @@ static void gpencil_engine_init(void *vedata)
 
   GPENCIL_NEXT_Data *ved = reinterpret_cast<GPENCIL_NEXT_Data *>(vedata);
   if (ved->instance == nullptr) {
-    ved->instance = new greasepencil::Instance();
+    ved->instance = new draw::greasepencil::Instance();
   }
 
   const DRWContextState *ctx_state = DRW_context_state_get();
@@ -283,12 +283,12 @@ static void gpencil_instance_free(void *instance)
   if (!GPU_shader_storage_buffer_objects_support()) {
     return;
   }
-  delete reinterpret_cast<greasepencil::Instance *>(instance);
+  delete reinterpret_cast<draw::greasepencil::Instance *>(instance);
 }
 
 static void gpencil_engine_free()
 {
-  blender::greasepencil::ShaderModule::module_free();
+  blender::draw::greasepencil::ShaderModule::module_free();
 }
 
 static void gpencil_render_to_image(void *vedata,

source/blender/draw/engines/gpencil/gpencil_layer.hh

@@ -14,7 +14,7 @@
 #include "draw_manager.hh"
 #include "draw_pass.hh"
 
-namespace blender::greasepencil {
+namespace blender::draw::greasepencil {
 
 using namespace draw;
 
@@ -31,7 +31,7 @@ class LayerModule {
 
   void sync(const Object * /*object*/,
             const bke::greasepencil::Layer & /*layer*/,
-          bool &do_layer_blending)
+            bool &do_layer_blending)
   {
     /* TODO(fclem): All of this is placeholder. */
     gpLayer gp_layer;
@@ -62,4 +62,4 @@ class LayerModule {
   }
 };
 
-}  // namespace blender::greasepencil
+}  // namespace blender::draw::greasepencil

source/blender/draw/engines/gpencil/gpencil_light.hh

@@ -15,7 +15,7 @@
 #include "draw_manager.hh"
 #include "draw_pass.hh"
 
-namespace blender::greasepencil {
+namespace blender::draw::greasepencil {
 
 using namespace draw;
 
@@ -127,4 +127,4 @@ class LightModule {
   }
 };
 
-}  // namespace blender::greasepencil
+}  // namespace blender::draw::greasepencil

source/blender/draw/engines/gpencil/gpencil_material.hh

@@ -15,7 +15,7 @@
 #include "draw_manager.hh"
 #include "draw_pass.hh"
 
-namespace blender::greasepencil {
+namespace blender::draw::greasepencil {
 
 using namespace draw;
 
@@ -170,7 +170,8 @@ class MaterialModule {
         *gp_style_override = blender::dna::shallow_copy(*gp_style);
         gp_style = gp_style_override;
         if ((gp_style_override->stroke_style == GP_MATERIAL_STROKE_STYLE_TEXTURE) &&
-            (gp_style_override->sima)) {
+            (gp_style_override->sima))
+        {
           copy_v4_fl(gp_style_override->stroke_rgba, 1.0f);
           gp_style_override->mix_stroke_factor = 0.0f;
         }
@@ -317,4 +318,4 @@ class MaterialModule {
   }
 };
 
-}  // namespace blender::greasepencil
+}  // namespace blender::draw::greasepencil

source/blender/draw/engines/gpencil/gpencil_object.hh

@@ -19,7 +19,7 @@
 #include "gpencil_material.hh"
 #include "gpencil_shader.hh"
 
-namespace blender::greasepencil {
+namespace blender::draw::greasepencil {
 
 using namespace draw;
 
@@ -248,4 +248,4 @@ class ObjectModule {
   }
 };
 
-}  // namespace blender::greasepencil
+}  // namespace blender::draw::greasepencil

source/blender/draw/engines/gpencil/gpencil_shader.cc

@@ -7,7 +7,7 @@
 
 #include "gpencil_shader.hh"
 
-namespace blender::greasepencil {
+namespace blender::draw::greasepencil {
 
 ShaderModule *ShaderModule::g_shader_module = nullptr;
 
@@ -113,4 +113,4 @@ GPUShader *ShaderModule::static_shader_get(eShaderType shader_type)
   return shaders_[shader_type];
 }
 
-}  // namespace blender::greasepencil
+}  // namespace blender::draw::greasepencil

source/blender/draw/engines/gpencil/gpencil_shader.hh

@@ -9,7 +9,7 @@
 
 #include "DRW_render.h"
 
-namespace blender::greasepencil {
+namespace blender::draw::greasepencil {
 
 enum eShaderType {
   /* SMAA antialiasing */
@@ -62,4 +62,4 @@ class ShaderModule {
   const char *static_shader_create_info_name_get(eShaderType shader_type);
 };
 
-}  // namespace blender::greasepencil
+}  // namespace blender::draw::greasepencil

source/blender/draw/engines/gpencil/gpencil_vfx.hh

@@ -17,7 +17,7 @@
 #include "gpencil_shader.hh"
 #include "gpencil_shader_shared.h"
 
-namespace blender::greasepencil {
+namespace blender::draw::greasepencil {
 
 using namespace draw;
 
@@ -82,7 +82,8 @@ struct VfxContext {
     }
 
     if (((fx->mode & eShaderFxMode_Realtime) && (is_viewport == true)) ||
-        ((fx->mode & eShaderFxMode_Render) && (is_viewport == false))) {
+        ((fx->mode & eShaderFxMode_Render) && (is_viewport == false)))
+    {
       return true;
     }
 
@@ -331,4 +332,4 @@ class VfxModule {
   }
 };
 
-}  // namespace blender::greasepencil
+}  // namespace blender::draw::greasepencil