Merged changes in the trunk up to revision 48505.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 3 Jul 2012 00:02:45 +0000 (00:02 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 3 Jul 2012 00:02:45 +0000 (00:02 +0000)
25 files changed:
1  2 
source/blender/CMakeLists.txt
source/blender/SConscript
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/operators/bmo_utils.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_meshdata_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blender/render/intern/source/convertblender.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt
source/creator/creator.c

index e9bae71feec6212e589e94aa3adfc23ce43caceb,3c75666857874b2cbed41ac41443ac0ef674ae65..1b9533bbd8c0dbcf8cc0b56a2768cbcfd9a43f90
@@@ -108,8 -105,12 +106,13 @@@ add_subdirectory(nodes
  add_subdirectory(modifiers)
  add_subdirectory(makesdna)
  add_subdirectory(makesrna)
 +ADD_SUBDIRECTORY(freestyle)
  
+ if(WITH_COMPOSITOR)
+       add_subdirectory(opencl)  # later on this may be used more generally
+       add_subdirectory(compositor)
+ endif()
  if(WITH_IMAGE_OPENEXR)
        add_subdirectory(imbuf/intern/openexr)
  endif()
index f602c93a208995137c0b17dc1b34d86520a63dea,e1f81f9aaba3195bf0401933180a014dc12e511a..8fb160ba09ae19e2cccf1084074468fe4aef3c18
@@@ -8,12 -8,9 +8,10 @@@ SConscript(['avi/SConscript'
              'blenlib/SConscript',
              'blenloader/SConscript',
              'gpu/SConscript',
-             'opencl/SConscript',
              'editors/SConscript',
 +                      'freestyle/SConscript',
              'imbuf/SConscript',
              'makesdna/SConscript',
-             'compositor/SConscript',
              'render/SConscript',
              'nodes/SConscript',
              'modifiers/SConscript',
index ed45b378228dc700fd07859f24c21e0be94028dd,c702972b3b71dfc2be3eae2c1ee45a2385c5031b..62af5cbad214e90f57f4817a992a2a801597a564
@@@ -1584,36 -1565,10 +1584,36 @@@ void RNA_def_main_masks(BlenderRNA *brn
        RNA_def_function_return(func, parm);
  
        /* remove func */
-       func= RNA_def_function(srna, "remove", "rna_Main_masks_remove");
+       func = RNA_def_function(srna, "remove", "rna_Main_masks_remove");
        RNA_def_function_ui_description(func, "Remove a masks from the current blendfile.");
-       parm= RNA_def_pointer(func, "mask", "Mask", "", "Mask to remove");
-       RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL);
+       parm = RNA_def_pointer(func, "mask", "Mask", "", "Mask to remove");
+       RNA_def_property_flag(parm, PROP_REQUIRED | PROP_NEVER_NULL);
  }
  
 +void RNA_def_main_linestyles(BlenderRNA *brna, PropertyRNA *cprop)
 +{
 +      StructRNA *srna;
 +      FunctionRNA *func;
 +      PropertyRNA *parm;
 +
 +      RNA_def_property_srna(cprop, "BlendDataLineStyles");
 +      srna= RNA_def_struct(brna, "BlendDataLineStyles", NULL);
 +      RNA_def_struct_sdna(srna, "Main");
 +      RNA_def_struct_ui_text(srna, "Main Line Styles", "Collection of line styles");
 +
 +      func= RNA_def_function(srna, "new", "rna_Main_linestyles_new");
 +      RNA_def_function_ui_description(func, "Add a new line style instance to the main database");
 +      parm= RNA_def_string(func, "name", "FreestyleLineStyle", 0, "", "New name for the datablock");
 +      RNA_def_property_flag(parm, PROP_REQUIRED);
 +      /* return type */
 +      parm= RNA_def_pointer(func, "linestyle", "FreestyleLineStyle", "", "New line style datablock");
 +      RNA_def_function_return(func, parm);
 +
 +      func= RNA_def_function(srna, "remove", "rna_Main_linestyles_remove");
 +      RNA_def_function_flag(func, FUNC_USE_REPORTS);
 +      RNA_def_function_ui_description(func, "Remove a line style instance from the current blendfile");
 +      parm= RNA_def_pointer(func, "linestyle", "FreestyleLineStyle", "", "Line style to remove");
 +      RNA_def_property_flag(parm, PROP_REQUIRED);
 +}
 +
  #endif
Simple merge
Simple merge