[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42945] branches/soc-2011-tomato: Merging r42896 through r42944 from trunk into soc-2911-tomato

Sergey Sharybin sergey.vfx at gmail.com
Wed Dec 28 19:31:39 CET 2011 

Revision: 42945
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42945
Author:   nazgul
Date:     2011-12-28 18:31:32 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
Merging r42896 through r42944 from trunk into soc-2911-tomato

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42896
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42944

Modified Paths:
--------------
    branches/soc-2011-tomato/release/scripts/modules/sys_info.py
    branches/soc-2011-tomato/release/scripts/presets/ffmpeg/DV.py
    branches/soc-2011-tomato/release/scripts/presets/ffmpeg/DVD.py
    branches/soc-2011-tomato/release/scripts/presets/ffmpeg/SVCD.py
    branches/soc-2011-tomato/release/scripts/presets/ffmpeg/VCD.py
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_colortools.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_customdata.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_global.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_movieclip.h
    branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/colortools.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh_validate.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
    branches/soc-2011-tomato/source/blender/blenlib/BLI_edgehash.h
    branches/soc-2011-tomato/source/blender/blenlib/BLI_math_color.h
    branches/soc-2011-tomato/source/blender/blenlib/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/blenlib/intern/edgehash.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/math_color.c
    branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_lib.c
    branches/soc-2011-tomato/source/blender/editors/render/render_internal.c
    branches/soc-2011-tomato/source/blender/editors/render/render_opengl.c
    branches/soc-2011-tomato/source/blender/editors/screen/glutil.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2011-tomato/source/blender/imbuf/IMB_imbuf.h
    branches/soc-2011-tomato/source/blender/imbuf/intern/divers.c
    branches/soc-2011-tomato/source/blender/makesdna/DNA_ID.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_actuator_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_brush_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_constraint_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_customdata_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_defs.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_documentation.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_material_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_mesh_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_meshdata_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_movieclip_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_node_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_particle_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_dynamicpaint.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_explode.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_fluidsim_util.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_util.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/soc-2011-tomato/source/blender/python/SConscript
    branches/soc-2011-tomato/source/blender/python/intern/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/python/intern/bpy_app.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_props.c
    branches/soc-2011-tomato/source/blender/quicktime/apple/qtkit_export.m
    branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c

Added Paths:
-----------
    branches/soc-2011-tomato/source/blender/blenlib/BLI_array.h
    branches/soc-2011-tomato/source/blender/blenlib/intern/math_color_inline.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_app_ffmpeg.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_app_ffmpeg.h

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-42895
   + /branches/soc-2011-cucumber:37517
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-42944

Modified: branches/soc-2011-tomato/release/scripts/modules/sys_info.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/sys_info.py	2011-12-28 18:18:48 UTC (rev 42944)
+++ branches/soc-2011-tomato/release/scripts/modules/sys_info.py	2011-12-28 18:31:32 UTC (rev 42945)
@@ -94,6 +94,16 @@
     output.write('autosave: {}\n'.format(bpy.utils.user_resource('AUTOSAVE')))
     output.write('tempdir: {}\n'.format(bpy.app.tempdir))
 
+    output.write('\nFFmpeg:\n')
+    output.write(lilies)
+    ffmpeg = bpy.app.ffmpeg
+    if ffmpeg.supported:
+        for lib in ['avcodec', 'avdevice', 'avformat', 'avutil', 'swscale']:
+            output.write('{}:{}{}\n'.format(lib, " "*(10-len(lib)),
+                         getattr(ffmpeg, lib + '_version_string')))
+    else:
+        output.write('Blender was built without FFmpeg support\n')
+
     if bpy.app.background:
         output.write('\nOpenGL: missing, background mode\n')
     else:

Modified: branches/soc-2011-tomato/release/scripts/presets/ffmpeg/DV.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/ffmpeg/DV.py	2011-12-28 18:18:48 UTC (rev 42944)
+++ branches/soc-2011-tomato/release/scripts/presets/ffmpeg/DV.py	2011-12-28 18:31:32 UTC (rev 42945)
@@ -11,4 +11,4 @@
 
 bpy.context.scene.render.ffmpeg_audio_mixrate = 48000
 bpy.context.scene.render.ffmpeg_audio_codec = "PCM"
-bpy.context.scene.render.ffmpeg_audio_channels = 2
+bpy.context.scene.render.ffmpeg_audio_channels = "STEREO"

Modified: branches/soc-2011-tomato/release/scripts/presets/ffmpeg/DVD.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/ffmpeg/DVD.py	2011-12-28 18:18:48 UTC (rev 42944)
+++ branches/soc-2011-tomato/release/scripts/presets/ffmpeg/DVD.py	2011-12-28 18:31:32 UTC (rev 42945)
@@ -21,4 +21,4 @@
 bpy.context.scene.render.ffmpeg_audio_codec = "AC3"
 bpy.context.scene.render.ffmpeg_audio_bitrate = 448
 bpy.context.scene.render.ffmpeg_audio_mixrate = 48000
-bpy.context.scene.render.ffmpeg_audio_channels = 6
+bpy.context.scene.render.ffmpeg_audio_channels = "SURROUND51"

Modified: branches/soc-2011-tomato/release/scripts/presets/ffmpeg/SVCD.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/ffmpeg/SVCD.py	2011-12-28 18:18:48 UTC (rev 42944)
+++ branches/soc-2011-tomato/release/scripts/presets/ffmpeg/SVCD.py	2011-12-28 18:31:32 UTC (rev 42945)
@@ -21,4 +21,4 @@
 bpy.context.scene.render.ffmpeg_audio_bitrate = 224
 bpy.context.scene.render.ffmpeg_audio_mixrate = 44100
 bpy.context.scene.render.ffmpeg_audio_codec = "MP2"
-bpy.context.scene.render.ffmpeg_audio_channels = 2
+bpy.context.scene.render.ffmpeg_audio_channels = "STEREO"

Modified: branches/soc-2011-tomato/release/scripts/presets/ffmpeg/VCD.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/ffmpeg/VCD.py	2011-12-28 18:18:48 UTC (rev 42944)
+++ branches/soc-2011-tomato/release/scripts/presets/ffmpeg/VCD.py	2011-12-28 18:31:32 UTC (rev 42945)
@@ -21,4 +21,4 @@
 bpy.context.scene.render.ffmpeg_audio_bitrate = 224
 bpy.context.scene.render.ffmpeg_audio_mixrate = 44100
 bpy.context.scene.render.ffmpeg_audio_codec = "MP2"
-bpy.context.scene.render.ffmpeg_audio_channels = 2
+bpy.context.scene.render.ffmpeg_audio_channels = "STEREO"

Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_colortools.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_colortools.h	2011-12-28 18:18:48 UTC (rev 42944)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_colortools.h	2011-12-28 18:31:32 UTC (rev 42945)
@@ -45,9 +45,6 @@
 #   define DO_INLINE static inline
 #endif
 
-void				floatbuf_to_srgb_byte(float *rectf, unsigned char *rectc, int x1, int x2, int y1, int y2, int w);
-void				floatbuf_to_byte(float *rectf, unsigned char *rectc, int x1, int x2, int y1, int y2, int w);
-
 struct CurveMapping	*curvemapping_add(int tot, float minx, float miny, float maxx, float maxy);
 void				curvemapping_free(struct CurveMapping *cumap);
 struct CurveMapping	*curvemapping_copy(struct CurveMapping *cumap);

Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_customdata.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_customdata.h	2011-12-28 18:18:48 UTC (rev 42944)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_customdata.h	2011-12-28 18:31:32 UTC (rev 42945)
@@ -75,6 +75,9 @@
 void CustomData_copy(const struct CustomData *source, struct CustomData *dest,
 					 CustomDataMask mask, int alloctype, int totelem);
 
+/* BMESH_TODO, not really a public function but readfile.c needs it */
+void CustomData_update_typemap(struct CustomData *data);
+
 /* same as the above, except that this will preserve existing layers, and only
  * add the layers that were not there yet */
 void CustomData_merge(const struct CustomData *source, struct CustomData *dest,
@@ -128,6 +131,7 @@
 void *CustomData_duplicate_referenced_layer(struct CustomData *data, const int type, const int totelem);
 void *CustomData_duplicate_referenced_layer_named(struct CustomData *data,
 												  const int type, const char *name, const int totelem);
+int CustomData_is_referenced_layer(struct CustomData *data, int type);
 
 /* set the CD_FLAG_NOCOPY flag in custom data layers where the mask is
  * zero for the layer type, so only layer types specified by the mask
@@ -144,12 +148,13 @@
 void CustomData_copy_data(const struct CustomData *source,
 						  struct CustomData *dest, int source_index,
 						  int dest_index, int count);
+void CustomData_copy_elements(int type, void *source, void *dest, int count);
 void CustomData_em_copy_data(const struct CustomData *source,
 							struct CustomData *dest, void *src_block,
 							void **dest_block);
 void CustomData_bmesh_copy_data(const struct CustomData *source, 
-							struct CustomData *dest,void *src_block, 
-							void **dest_block);
+                                struct CustomData *dest, void *src_block, 
+                                void **dest_block);
 void CustomData_em_validate_data(struct CustomData *data, void *block, int sub_elements);
 
 /* frees data in a CustomData object
@@ -191,11 +196,18 @@
  * returns NULL if there is no layer of type
  */
 void *CustomData_get(const struct CustomData *data, int index, int type);
+void *CustomData_get_n(const struct CustomData *data, int type, int index, int n);
 void *CustomData_em_get(const struct CustomData *data, void *block, int type);
 void *CustomData_em_get_n(const struct CustomData *data, void *block, int type, int n);
 void *CustomData_bmesh_get(const struct CustomData *data, void *block, int type);
 void *CustomData_bmesh_get_n(const struct CustomData *data, void *block, int type, int n);
 
+/* gets the layer at physical index n, with no type checking.
+ */
+void *CustomData_bmesh_get_layer_n(const struct CustomData *data, void *block, int n);
+
+int CustomData_set_layer_name(const struct CustomData *data, int type, int n, const char *name);
+
 /* gets a pointer to the active or first layer of type
  * returns NULL if there is no layer of type
  */
@@ -205,6 +217,7 @@
 								 const char *name);
 
 int CustomData_get_layer_index(const struct CustomData *data, int type);
+int CustomData_get_layer_index_n(const struct CustomData *data, int type, int n);
 int CustomData_get_named_layer_index(const struct CustomData *data, int type, const char *name);
 int CustomData_get_active_layer_index(const struct CustomData *data, int type);
 int CustomData_get_render_layer_index(const struct CustomData *data, int type);
@@ -231,6 +244,11 @@
 
 void CustomData_bmesh_set_n(struct CustomData *data, void *block, int type, int n, 
 							void *source);
+/*sets the data of the block at physical layer n.  no real type checking 
+ *is performed.
+ */
+void CustomData_bmesh_set_layer_n(struct CustomData *data, void *block, int n,
+							void *source);
 
 /* set the pointer of to the first layer of type. the old data is not freed.
  * returns the value of ptr if the layer is found, NULL otherwise

Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_global.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_global.h	2011-12-28 18:18:48 UTC (rev 42944)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_global.h	2011-12-28 18:31:32 UTC (rev 42945)
@@ -141,6 +141,7 @@
 #define G_FILE_RECOVER			 (1 << 23)
 #define G_FILE_RELATIVE_REMAP	 (1 << 24)
 #define G_FILE_HISTORY			 (1 << 25)
+#define G_FILE_MESH_COMPAT		 (1 << 26)				/* BMesh option to save as older mesh format */
 
 /* G.windowstate */
 #define G_WINDOWSTATE_USERDEF		0

Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_mesh.h	2011-12-28 18:18:48 UTC (rev 42944)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_mesh.h	2011-12-28 18:31:32 UTC (rev 42945)
@@ -57,6 +57,11 @@
 struct EditMesh *BKE_mesh_get_editmesh(struct Mesh *me);
 void BKE_mesh_end_editmesh(struct Mesh *me, struct EditMesh *em);
 
+/* for forwards compat only quad->tri polys to mface, skip ngons.
+ */
+int mesh_mpoly_to_mface(struct CustomData *fdata, struct CustomData *ldata,
+	struct CustomData *pdata, int totface, int totloop, int totpoly);
+
 void unlink_mesh(struct Mesh *me);
 void free_mesh(struct Mesh *me);
 struct Mesh *add_mesh(const char *name);
@@ -159,6 +164,11 @@
 
 void BKE_mesh_ensure_navmesh(struct Mesh *me);
 
+/*convert a triangle of loop facedata to mface facedata*/
+void mesh_loops_to_mface_corners(struct CustomData *fdata, struct CustomData *ldata,

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list