* Merged changes in the trunk up to revision 31789.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 6 Sep 2010 23:26:36 +0000 (23:26 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 6 Sep 2010 23:26:36 +0000 (23:26 +0000)
* Made a local fix for a compilation error with VC++ 2008 and
CMake, reported to the bf-committers mailing list:
http://lists.blender.org/pipermail/bf-committers/2010-September/028643.html

21 files changed:
1  2 
release/scripts/ui/space_userpref.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/material.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_outliner/outliner.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/RNA_types.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/SConscript
source/blender/python/doc/sphinx_doc_gen.py
source/creator/CMakeLists.txt
source/creator/SConscript
source/creator/creator.c

Simple merge
index af75ef1dbf6160aa16ccd8215dfbbb46b5d2dfc0,0603081b59cb4ac7cd34022e0c39ad5ef59b8aa5..6a106bbe9b045bdbb20f66bab3434739619bc82c
  FILE(GLOB SRC intern/*.c)
  
  SET(INC 
-       . ../../../intern/guardedalloc ../../../intern/memutil ../editors/include ../blenlib ../makesdna ../modifiers
-       ../render/extern/include ../../../intern/decimation/extern
-       ../imbuf ../avi ../../../intern/elbeem/extern ../../../intern/opennl/extern
-       ../../../intern/iksolver/extern ../blenloader ../ikplugin ../freestyle
-       ../nodes ../../../extern/glew/include ../gpu ../makesrna ../../../intern/smoke/extern
-       ../../../intern/bsp/extern ../blenfont
+       .
+       ../avi
+       ../blenlib
+       ../blenloader
+       ../editors/include
++      ../freestyle
+       ../gpu
+       ../ikplugin
+       ../imbuf
+       ../makesdna
+       ../makesrna
+       ../modifiers
+       ../nodes
+       ../render/extern/include
+       ../../../extern/glew/include
        ../../../intern/audaspace/intern
+       ../../../intern/bsp/extern ../blenfont
+       ../../../intern/decimation/extern
+       ../../../intern/elbeem/extern
+       ../../../intern/guardedalloc
+       ../../../intern/iksolver/extern
+       ../../../intern/memutil
+       ../../../intern/opennl/extern
+       ../../../intern/smoke/extern
      ../../../source/blender/windowmanager # XXX - BAD LEVEL CALL WM_api.h
        ${ZLIB_INC}
  )
Simple merge
index ab1dc3fe909b628ab3065635354135cb05d6b823,998b3c670d0eed71c7dc0dae3c5ba707fac53d90..4dc711f24195c37f79ef1c30c7573e08248dee2a
  FILE(GLOB SRC intern/*.c)
  
  SET(INC 
-       . ../makesdna ../blenkernel ../../../intern/guardedalloc ../include
-       ../gpu ../../../intern/ghost
+       .
+       ../makesdna
+       ../blenkernel
+       ../include
+       ../gpu
+       ../../../intern/ghost
+       ../../../intern/guardedalloc
        ${FREETYPE_INCLUDE_DIRS}
 +      ${ZLIB_INC}
  )
  
  IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
Simple merge
Simple merge
Simple merge
index 6ca142d11311b2dc6bbbde9bc2643283ac53bce4,7ccef4ba0316880a3fa2b08009fd9cbe5a3ceeaf..97cb2b9f3da72a5853e3bc00d3b7bec3d25fe38d
@@@ -941,49 -939,33 +942,76 @@@ static void rna_TimeLine_remove(Scene *
        MEM_freeN(marker);
  }
  
+ static KeyingSet *rna_Scene_keying_set_new(Scene *sce, ReportList *reports, 
+               char name[], int absolute, int insertkey_needed, int insertkey_visual)
+ {
+       KeyingSet *ks= NULL;
+       short flag=0, keyingflag=0;
+       
+       /* validate flags */
+       if (absolute)
+               flag |= KEYINGSET_ABSOLUTE;
+       if (insertkey_needed)
+               keyingflag |= INSERTKEY_NEEDED;
+       if (insertkey_visual)
+               keyingflag |= INSERTKEY_MATRIX;
+               
+       /* call the API func, and set the active keyingset index */
+       ks= BKE_keyingset_add(&sce->keyingsets, name, flag, keyingflag);
+       
+       if (ks) {
+               sce->active_keyingset= BLI_countlist(&sce->keyingsets);
+               return ks;
+       }
+       else {
+               BKE_report(reports, RPT_ERROR, "Keying Set could not be added.");
+               return NULL;
+       }
+ }
 +static PointerRNA rna_FreestyleLineSet_linestyle_get(PointerRNA *ptr)
 +{
 +      FreestyleLineSet *lineset= (FreestyleLineSet *)ptr->data;
 +
 +      return rna_pointer_inherit_refine(ptr, &RNA_FreestyleLineStyle, lineset->linestyle);
 +}
 +
 +static void rna_FreestyleLineSet_linestyle_set(PointerRNA *ptr, PointerRNA value)
 +{
 +      FreestyleLineSet *lineset= (FreestyleLineSet*)ptr->data;
 +
 +      lineset->linestyle->id.us--;
 +      lineset->linestyle = (FreestyleLineStyle *)value.data;
 +      lineset->linestyle->id.us++;
 +}
 +
 +static PointerRNA rna_FreestyleSettings_active_lineset_get(PointerRNA *ptr)
 +{
 +      FreestyleConfig *config= (FreestyleConfig *)ptr->data;
 +      FreestyleLineSet *lineset= FRS_get_active_lineset(config);
 +      return rna_pointer_inherit_refine(ptr, &RNA_FreestyleLineSet, lineset);
 +}
 +
 +static void rna_FreestyleSettings_active_lineset_index_range(PointerRNA *ptr, int *min, int *max)
 +{
 +      FreestyleConfig *config= (FreestyleConfig *)ptr->data;
 +      *min= 0;
 +      *max= BLI_countlist(&config->linesets)-1;
 +      *max= MAX2(0, *max);
 +}
 +
 +static int rna_FreestyleSettings_active_lineset_index_get(PointerRNA *ptr)
 +{
 +      FreestyleConfig *config= (FreestyleConfig *)ptr->data;
 +      return FRS_get_active_lineset_index(config);
 +}
 +
 +static void rna_FreestyleSettings_active_lineset_index_set(PointerRNA *ptr, int value)
 +{
 +      FreestyleConfig *config= (FreestyleConfig *)ptr->data;
 +      FRS_set_active_lineset_index(config, value);
 +}
 +
  #else
  
  static void rna_def_transform_orientation(BlenderRNA *brna)
Simple merge
Simple merge
Simple merge
Simple merge