Cycles: svn merge -r41182:41205 ^/trunk/blender

[blender-staging.git] / source / blender / makesrna / intern / rna_scene.c

diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 911dd6ac396ad613ec59844cfaab1c484073d1c2..d525af29d6b5cb691bbd4fc10cbea683f3630497 100644 (file)
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -178,7 +178,6 @@ EnumPropertyItem image_color_mode_items[] ={
 
 #include "BLI_threads.h"
 #include "BLI_editVert.h"
 
 #include "BLI_threads.h"
 #include "BLI_editVert.h"

-#include "BLI_blenlib.h"

 
 #include "BKE_context.h"
 #include "BKE_global.h"
 
 #include "BKE_context.h"
 #include "BKE_global.h"


@@ -203,7 +202,7 @@ EnumPropertyItem image_color_mode_items[] ={
 #include "ED_mesh.h"
 #include "ED_keyframing.h"
 
 #include "ED_mesh.h"
 #include "ED_keyframing.h"
 

-#include "RE_pipeline.h"
+#include "RE_engine.h"

 
 static int rna_Scene_object_bases_lookup_string(PointerRNA *ptr, const char *key, PointerRNA *r_ptr)
 {
 
 static int rna_Scene_object_bases_lookup_string(PointerRNA *ptr, const char *key, PointerRNA *r_ptr)
 {