diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-01-09 18:07:14 +0300 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-01-09 18:07:14 +0300 |
| commit | 0ec378f3fea3be9235b5bc8cb976d6126ae808f5 (patch) | |
| tree | 5266bf2dff77d453046265892380e441cb4643be /source/blender/render/extern/include/RE_pipeline.h | |
| parent | ddcb91fc213cb9d9f87558f88a4831cd4c8e2791 (diff) | |
| parent | 99e203dbd46237c204fa697374e21769473955f5 (diff) | |
Merged changes in the trunk up to revision 34193.
Conflicts resolved:
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/space_nla/nla_channels.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
API changes resolved:
source/blender/freestyle/intern/system/PythonInterpreter.h
Diffstat (limited to 'source/blender/render/extern/include/RE_pipeline.h')
| -rw-r--r-- | source/blender/render/extern/include/RE_pipeline.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index 7d6046b5537..50b23f65401 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -32,7 +32,6 @@ #include "DNA_listBase.h" #include "DNA_vec_types.h" -#include "BKE_utildefines.h" #include "RNA_types.h" struct bNodeTree; |