[Bf-blender-cvs] [6b655a1] bake-cycles: Bake api: include cleanup

Campbell Barton noreply at git.blender.org
Sun Apr 27 12:44:38 CEST 2014


Commit: 6b655a1f241f1ff3f65c95f0eb972e6fe9286663
Author: Campbell Barton
Date:   Sun Apr 27 20:29:22 2014 +1000
https://developer.blender.org/rB6b655a1f241f1ff3f65c95f0eb972e6fe9286663

Bake api: include cleanup

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

M	source/blender/editors/object/object_bake_api.c
M	source/blender/render/intern/source/bake_api.c

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

diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c
index d10d554..63682d1 100644
--- a/source/blender/editors/object/object_bake_api.c
+++ b/source/blender/editors/object/object_bake_api.c
@@ -29,16 +29,11 @@
  *  \ingroup edobj
  */
 
-#include <string.h>
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_space_types.h"
 #include "DNA_object_types.h"
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_material_types.h"
 
 #include "RNA_access.h"
@@ -48,38 +43,24 @@
 #include "BLI_listbase.h"
 #include "BLI_string.h"
 #include "BLI_fileops.h"
-#include "BLI_threads.h"
-#include "BLI_utildefines.h"
 #include "BLI_math_geom.h"
 #include "BLI_path_util.h"
 
-#include "BKE_blender.h"
-#include "BKE_ccg.h"
-#include "BKE_screen.h"
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
-#include "BKE_multires.h"
 #include "BKE_report.h"
-#include "BKE_cdderivedmesh.h"
 #include "BKE_modifier.h"
-#include "BKE_DerivedMesh.h"
-#include "BKE_subsurf.h"
-#include "BKE_depsgraph.h"
 #include "BKE_mesh.h"
-#include "BKE_scene.h"
 
 #include "RE_engine.h"
 #include "RE_pipeline.h"
-#include "RE_shader_ext.h"
-#include "RE_multires_bake.h"
 
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
 
-#include "GPU_draw.h" /* GPU_free_image */
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -88,7 +69,6 @@
 #include "ED_screen.h"
 #include "ED_uvedit.h"
 
-#include "RE_bake.h"
 
 #include "object_intern.h"
 
diff --git a/source/blender/render/intern/source/bake_api.c b/source/blender/render/intern/source/bake_api.c
index 4938b64..d8963ce 100644
--- a/source/blender/render/intern/source/bake_api.c
+++ b/source/blender/render/intern/source/bake_api.c
@@ -24,52 +24,25 @@
  *  \ingroup render
  */
 
-
-/* system includes */
-#include <stdio.h>
-#include <string.h>
-
-/* External modules: */
 #include "MEM_guardedalloc.h"
 
 #include "BLI_math.h"
-#include "BLI_blenlib.h"
-#include "BLI_threads.h"
-#include "BLI_utildefines.h"
 
-#include "DNA_image_types.h"
-#include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
 
-#include "BKE_customdata.h"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_mesh.h"
-#include "BKE_global.h"
 #include "BKE_image.h"
-#include "BKE_main.h"
 #include "BKE_node.h"
-#include "BKE_scene.h"
-#include "BKE_library.h"
-
-#include "BKE_bvhutils.h"
-#include "BKE_DerivedMesh.h"
 
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
-#include "IMB_colormanagement.h"
 
 #include "RE_bake.h"
 
 /* local include */
-#include "rayintersection.h"
-#include "rayobject.h"
 #include "render_types.h"
-#include "renderdatabase.h"
-#include "shading.h"
 #include "zbuf.h"
 
-#include "PIL_time.h"
 
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* defined in pipeline.c, is hardcopy of active dynamic allocated Render */




More information about the Bf-blender-cvs mailing list