Merging trunk up to revision 41245.
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 24 Oct 2011 14:52:04 +0000 (14:52 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 24 Oct 2011 14:52:04 +0000 (14:52 +0000)
153 files changed:
1  2 
CMakeLists.txt
GNUmakefile
SConstruct
build_files/cmake/cmake_consistency_check.py
build_files/cmake/macros.cmake
build_files/cmake/project_info.py
build_files/cmake/project_source_info.py
extern/CMakeLists.txt
intern/ffmpeg/ffmpeg_compat.h
intern/ghost/GHOST_ISystem.h
intern/ghost/intern/GHOST_System.cpp
intern/ghost/intern/GHOST_System.h
intern/itasc/CMakeLists.txt
intern/moto/CMakeLists.txt
release/scripts/startup/bl_operators/wm.py
release/scripts/startup/bl_ui/__init__.py
release/scripts/startup/bl_ui/properties_particle.py
release/scripts/startup/bl_ui/properties_scene.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/CMakeLists.txt
source/blender/blenfont/intern/blf_lang.c
source/blender/blenkernel/BKE_context.h
source/blender/blenkernel/BKE_image.h
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/armature.c
source/blender/blenkernel/intern/brush.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/context.c
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/idcode.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/lattice.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/mball.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/mesh_validate.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenkernel/intern/speaker.c
source/blender/blenkernel/intern/texture.c
source/blender/blenkernel/intern/world.c
source/blender/blenlib/BLI_bpath.h
source/blender/blenlib/BLI_math_rotation.h
source/blender/blenlib/BLI_threads.h
source/blender/blenlib/intern/bpath.c
source/blender/blenlib/intern/math_rotation.c
source/blender/blenlib/intern/string_utf8.c
source/blender/blenlib/intern/threads.c
source/blender/blenlib/intern/uvproject.c
source/blender/blenloader/intern/readblenentry.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/readfile.h
source/blender/blenloader/intern/writefile.c
source/blender/collada/CameraExporter.cpp
source/blender/collada/DocumentImporter.cpp
source/blender/editors/CMakeLists.txt
source/blender/editors/animation/keyingsets.c
source/blender/editors/gpencil/drawgpencil.c
source/blender/editors/include/ED_space_api.h
source/blender/editors/include/ED_transform.h
source/blender/editors/include/ED_view3d.h
source/blender/editors/include/UI_icons.h
source/blender/editors/include/UI_interface.h
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/interface_draw.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/interface/resources.c
source/blender/editors/object/object_constraint.c
source/blender/editors/render/render_internal.c
source/blender/editors/screen/area.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_api/spacetypes.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_text/text_ops.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/editors/space_view3d/view3d_ops.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_ops.c
source/blender/editors/util/CMakeLists.txt
source/blender/imbuf/CMakeLists.txt
source/blender/imbuf/IMB_imbuf.h
source/blender/imbuf/intern/allocimbuf.c
source/blender/imbuf/intern/filter.c
source/blender/imbuf/intern/module.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_camera_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesdna/DNA_view3d_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_camera.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_nodetree_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_screen.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_ui_api.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/modifiers/intern/MOD_uvproject.c
source/blender/nodes/NOD_composite.h
source/blender/nodes/composite/node_composite_tree.c
source/blender/nodes/composite/node_composite_util.h
source/blender/nodes/composite/nodes/node_composite_scale.c
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/envmap.c
source/blender/render/intern/source/initrender.c
source/blender/windowmanager/WM_types.h
source/blender/windowmanager/intern/wm_operators.c
source/blenderplayer/CMakeLists.txt
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt
source/creator/creator.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
source/gameengine/Ketsji/KX_Camera.cpp
source/gameengine/Ketsji/KX_Camera.h
source/gameengine/Ketsji/KX_KetsjiEngine.cpp
source/gameengine/Rasterizer/RAS_CameraData.h
source/gameengine/Rasterizer/RAS_FramingManager.cpp
source/gameengine/Rasterizer/RAS_FramingManager.h
source/gameengine/VideoTexture/ImageRender.cpp

diff --cc CMakeLists.txt
Simple merge
diff --cc GNUmakefile
index c68c8684687259ce83f0f75985eb2dfb461a2693,b06344ca238b4aacdb58ab4caefce1d2dc498327..5d1e5fec0734a3d418142290b3d54afab9e06221
@@@ -1,6 -1,5 +1,6 @@@
  # -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
 -# vim: tabstop=4
 +# vim: tabstop=8
- # $Id$
++# $Id: GNUmakefile 41122 2011-10-19 21:55:27Z campbellbarton $
  #
  # ##### BEGIN GPL LICENSE BLOCK #####
  #
diff --cc SConstruct
index aeaef581145ce60bae54f87f81d31b77872a2c94,93787cdddceac235ce07b5de64ddd74b40f979da..0db32365bfcfa214ddc98084fa4e961ca5d8ef71
@@@ -1,5 -1,5 +1,5 @@@
  #!/usr/bin/env python
- # $Id$
 -#
++# $Id: SConstruct 41169 2011-10-21 04:23:26Z campbellbarton $
  # ***** BEGIN GPL LICENSE BLOCK *****
  #
  # This program is free software; you can redistribute it and/or
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index b1ad04eb70d9f66e7455a2c447d6959c051c0794,f8cdc3ec873e96c20479f119f2c1007761f42f1c..a9c28be666327d1be9a651092781091a3f004100
@@@ -312,6 -310,20 +310,18 @@@ size_t BLI_strncpy_wchar_from_utf8(wcha
        }
  
  
 -      (void)mask; /* quiet warning */
 -
+ /* uses glib functions but not from glib */
+ /* gets the size of a single utf8 char */
+ int BLI_str_utf8_size(const char *p)
+ {
+       int mask = 0, len;
+     unsigned char c = (unsigned char) *p;
+     UTF8_COMPUTE (c, mask, len);
+       return len;
+ }
  /* was g_utf8_get_char */
  /**
   * BLI_str_utf8_as_unicode:
Simple merge
Simple merge
Simple merge
Simple merge
index 057641723590a242c26c5497ead6fde9792c7824,479c7ed5626ec32118f7bfd6a4508332a1d5e86a..6705bb941a19ad89997fca06d092499925cf80a8
@@@ -1,5 -1,5 +1,4 @@@
  /*
-  * $Id$
 - *
   *
   * ***** BEGIN GPL LICENSE BLOCK *****
   *
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge