Merged changes in the trunk up to revision 32684.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 24 Oct 2010 13:05:09 +0000 (13:05 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 24 Oct 2010 13:05:09 +0000 (13:05 +0000)
15 files changed:
1  2 
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/render/CMakeLists.txt
source/blender/editors/transform/transform.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_ID.c
source/blender/python/CMakeLists.txt
source/blender/render/CMakeLists.txt
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/shadeoutput.c
source/creator/CMakeLists.txt
source/creator/creator.c

index c8645f91de813e6d592705b8bbe6576d5cda0dc0,5252003c5b3ea54da9aabb9ff7dd8568d4205199..7e701f19a186c2c877296c45e11ae2bfd51a52e8
@@@ -55,6 -52,93 +53,94 @@@ SET(IN
        ${ZLIB_INC}
  )
  
+ SET(SRC
+       intern/BME_Customdata.c
+       intern/BME_conversions.c
+       intern/BME_eulers.c
+       intern/BME_mesh.c
+       intern/BME_structure.c
+       intern/BME_tools.c
+       intern/CCGSubSurf.c
+       intern/DerivedMesh.c
+       intern/action.c
+       intern/anim.c
+       intern/anim_sys.c
+       intern/armature.c
+       intern/blender.c
+       intern/bmfont.c
+       intern/boids.c
+       intern/booleanops_mesh.c
+       intern/brush.c
+       intern/bullet.c
+       intern/bvhutils.c
+       intern/cdderivedmesh.c
+       intern/cloth.c
+       intern/collision.c
+       intern/colortools.c
+       intern/constraint.c
+       intern/context.c
+       intern/curve.c
+       intern/customdata.c
+       intern/customdata_file.c
+       intern/deform.c
+       intern/depsgraph.c
+       intern/displist.c
+       intern/effect.c
+       intern/exotic.c
+       intern/fcurve.c
+       intern/fluidsim.c
+       intern/fmodifier.c
+       intern/font.c
+       intern/gpencil.c
+       intern/group.c
+       intern/icons.c
+       intern/idcode.c
+       intern/idprop.c
+       intern/image.c
+       intern/image_gen.c
+       intern/implicit.c
+       intern/ipo.c
+       intern/key.c
+       intern/lattice.c
+       intern/library.c
++      intern/linestyle.c
+       intern/material.c
+       intern/mball.c
+       intern/mesh.c
+       intern/modifier.c
+       intern/multires.c
+       intern/nla.c
+       intern/node.c
+       intern/object.c
+       intern/packedFile.c
+       intern/paint.c
+       intern/particle.c
+       intern/particle_system.c
+       intern/pointcache.c
+       intern/property.c
+       intern/report.c
+       intern/sca.c
+       intern/scene.c
+       intern/screen.c
+       intern/script.c
+       intern/seqcache.c
+       intern/seqeffects.c
+       intern/sequencer.c
+       intern/shrinkwrap.c
+       intern/sketch.c
+       intern/smoke.c
+       intern/softbody.c
+       intern/sound.c
+       intern/subsurf_ccg.c
+       intern/suggestions.c
+       intern/text.c
+       intern/texture.c
+       intern/unit.c
+       intern/world.c
+       intern/writeavi.c
+       intern/writeffmpeg.c
+       intern/writeframeserver.c
+ )
  
  ADD_DEFINITIONS(-DGLEW_STATIC)
  
@@@ -109,12 -193,12 +195,12 @@@ ELSE(WITH_PYTHON
  ENDIF(WITH_PYTHON)
  
  IF(WITH_OPENMP)
 -      ADD_DEFINITIONS(-DPARALLEL=1)
 +              ADD_DEFINITIONS(-DPARALLEL=1)
  ENDIF(WITH_OPENMP)
  
- IF(NOT WITH_FLUID)
+ IF(NOT WITH_MOD_FLUID)
        ADD_DEFINITIONS(-DDISABLE_ELBEEM)
- ENDIF(NOT WITH_FLUID)
+ ENDIF(NOT WITH_MOD_FLUID)
  
  IF(WITH_JACK)
        ADD_DEFINITIONS(-DWITH_JACK)
Simple merge
index 0ef2346ded44743e4732d14707932f48b23303ef,a37723a82870033dedf7d0390239d5d2595e7260..2e2ed3c57336b6dd4ae64de3cd01ca846aa0dd1b
@@@ -36,12 -34,54 +34,55 @@@ SET(IN
        ../../../intern/guardedalloc
        ${ZLIB_INC}
        ${FREETYPE_INCLUDE_DIRS}
 +      ${ZLIB_INC}
  )
  
- # unused
- LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/BLI_bfile.c")
+ SET(SRC
+       intern/BLI_args.c
+       intern/BLI_dynstr.c
+       intern/BLI_ghash.c
+       intern/BLI_heap.c
+       intern/BLI_kdopbvh.c
+       intern/BLI_kdtree.c
+       intern/BLI_linklist.c
+       intern/BLI_memarena.c
+       intern/BLI_mempool.c
+       intern/DLRB_tree.c
+       intern/boxpack2d.c
+       intern/bpath.c
+       intern/cpu.c
+       intern/dynlib.c
+       intern/edgehash.c
+       intern/fileops.c
+       intern/fnmatch.c
+       intern/freetypefont.c
+       intern/graph.c
+       intern/gsqueue.c
+       intern/jitter.c
+       intern/listbase.c
+       intern/math_base.c
+       intern/math_base_inline.c
+       intern/math_color.c
+       intern/math_geom.c
+       intern/math_geom_inline.c
+       intern/math_matrix.c
+       intern/math_rotation.c
+       intern/math_vector.c
+       intern/math_vector_inline.c
+       intern/noise.c
+       intern/path_util.c
+       intern/pbvh.c
+       intern/rand.c
+       intern/rct.c
+       intern/scanfill.c
+       intern/storage.c
+       intern/string.c
+       intern/threads.c
+       intern/time.c
+       intern/uvproject.c
+       intern/voxel.c
+       intern/winstuff.c
+ )
  
  IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
        LIST(APPEND INC "${BINRELOC_INC}")
index 9a03d12509d6daf9d9632a020399deefd6c7ff4c,57ee27c3b6b7a2c13d5da2b69ff9fa14014874aa..d952d19bc00ddd2ac9bc18bd339ade48ea349fa4
@@@ -35,9 -33,16 +33,17 @@@ SET(IN
        ../../windowmanager
        ../../../../intern/guardedalloc
        ../../../../extern/glew/include
 +      ../../freestyle
  )
  
+ SET(SRC
+       render_internal.c
+       render_opengl.c
+       render_ops.c
+       render_preview.c
+       render_shading.c
+ )
  IF(WITH_QUICKTIME)
        LIST(APPEND INC ../../quicktime ${QUICKTIME_INC})
        ADD_DEFINITIONS(-DWITH_QUICKTIME)
Simple merge
index 5085a371688a819f5567a215f4a05c0d82e9bfe7,bed48a3fd1770477227394a151bdc7a6f493e461..10a6d891e426efa4449931f6f0ca17e73f1210c5
@@@ -42,9 -40,44 +40,45 @@@ SET(IN
        ../../kernel/gen_messaging
        ../../../intern/smoke/extern
        ../../../intern/guardedalloc
 +      ../freestyle
  )
  
+ SET(SRC
+       intern/raytrace/rayobject.cpp
+       intern/raytrace/rayobject_qbvh.cpp
+       intern/raytrace/rayobject_rtbuild.cpp
+       intern/raytrace/rayobject_svbvh.cpp
+       intern/raytrace/rayobject_vbvh.cpp
+       intern/source/convertblender.c
+       intern/source/envmap.c
+       intern/source/gammaCorrectionTables.c
+       intern/source/imagetexture.c
+       intern/source/initrender.c
+       intern/source/occlusion.c
+       intern/source/pipeline.c
+       intern/source/pixelblending.c
+       intern/source/pixelshading.c
+       intern/source/pointdensity.c
+       intern/source/rayobject_blibvh.c
+       intern/source/rayobject_instance.c
+       intern/source/rayobject_octree.c
+       intern/source/rayobject_raycounter.c
+       intern/source/rayshade.c
+       intern/source/rendercore.c
+       intern/source/renderdatabase.c
+       intern/source/shadbuf.c
+       intern/source/shadeinput.c
+       intern/source/shadeoutput.c
+       intern/source/sss.c
+       intern/source/strand.c
+       intern/source/sunsky.c
+       intern/source/texture.c
+       intern/source/volume_precache.c
+       intern/source/volumetric.c
+       intern/source/voxeldata.c
+       intern/source/zbuf.c
+ )
  IF(WIN32)
        LIST(APPEND INC ${PTHREADS_INC})
  ENDIF(WIN32)
Simple merge
Simple merge