[Bf-blender-cvs] [2b0507b0d9d] temp-greasepencil-vfx: Cleanup: Reorder FX effects list and remove unused code

Antonio Vazquez noreply at git.blender.org
Fri Jun 29 11:42:18 CEST 2018


Commit: 2b0507b0d9d636d3407ebcbcdab2b31b5a63cb6e
Author: Antonio Vazquez
Date:   Fri Jun 29 11:36:10 2018 +0200
Branches: temp-greasepencil-vfx
https://developer.blender.org/rB2b0507b0d9d636d3407ebcbcdab2b31b5a63cb6e

Cleanup: Reorder FX effects list and remove unused code

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

M	source/blender/makesrna/intern/rna_shader_fx.c

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

diff --git a/source/blender/makesrna/intern/rna_shader_fx.c b/source/blender/makesrna/intern/rna_shader_fx.c
index 99489c11737..67a00da4175 100644
--- a/source/blender/makesrna/intern/rna_shader_fx.c
+++ b/source/blender/makesrna/intern/rna_shader_fx.c
@@ -27,12 +27,8 @@
 #include <limits.h>
 #include <stdlib.h>
 
-#include "DNA_armature_types.h"
-#include "DNA_cachefile_types.h"
-#include "DNA_mesh_types.h"
 #include "DNA_shader_fx_types.h"
 #include "DNA_object_types.h"
-#include "DNA_object_force_types.h"
 #include "DNA_scene_types.h"
 
 #include "MEM_guardedalloc.h"
@@ -42,12 +38,6 @@
 #include "BLT_translation.h"
 
 #include "BKE_animsys.h"
-#include "BKE_DerivedMesh.h"
-#include "BKE_dynamicpaint.h"
-#include "BKE_effect.h"
-#include "BKE_mesh_mapping.h"
-#include "BKE_mesh_remap.h"
-#include "BKE_multires.h"
 #include "BKE_shader_fx.h"
 
 #include "RNA_access.h"
@@ -60,27 +50,21 @@
 #include "WM_types.h"
 
 const EnumPropertyItem rna_enum_object_shaderfx_type_items[] = {
-//	{ 0, "", 0, N_("Visual Effects"), "" },
-	{eShaderFxType_Blur, "FX_BLUR", ICON_SOLO_ON, "Gaussian Blur", "Apply Gaussian Blur to object" },
-	{eShaderFxType_Flip, "FX_FLIP", ICON_SOLO_ON, "Flip", "Flip image"},
+	{eShaderFxType_Blur, "FX_BLUR", ICON_SOLO_ON, "Blur", "Apply Gaussian Blur to object" },
+	{eShaderFxType_Flip, "FX_FLIP", ICON_SOLO_ON, "Flip", "Flip image" },
+	{eShaderFxType_Light, "FX_LIGHT", ICON_SOLO_ON, "Light", "Simulate ilumination" },
 	{eShaderFxType_Pixel, "FX_PIXEL", ICON_SOLO_ON, "Pixelate", "Pixelate image"},
 	{eShaderFxType_Swirl, "FX_SWIRL", ICON_SOLO_ON, "Swirl", "Create a rotation distortion"},
 	{eShaderFxType_Wave, "FX_WAVE", ICON_SOLO_ON, "Wave Distortion", "Apply sinusoidal deformation"},
-	{eShaderFxType_Light, "FX_LIGHT", ICON_SOLO_ON, "Light", "Simulate ilumination" },
 	{0, NULL, 0, NULL, NULL}
 };
 
 #ifdef RNA_RUNTIME
 
-#include "DNA_particle_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_smoke_types.h"
-
-#include "BKE_cachefile.h"
-#include "BKE_context.h"
-#include "BKE_library.h"
+//#include "BKE_context.h"
+//#include "BKE_library.h"
 #include "BKE_shader_fx.h"
-#include "BKE_object.h"
+//#include "BKE_object.h"
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_build.h"



More information about the Bf-blender-cvs mailing list