[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55392] branches/soc-2008-mxcurioni: svn merge ^/trunk/blender -r55357:55372

Campbell Barton ideasman42 at gmail.com
Mon Mar 18 22:45:29 CET 2013 

Revision: 55392
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55392
Author:   campbellbarton
Date:     2013-03-18 21:45:29 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
svn merge ^/trunk/blender -r55357:55372

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

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_guardedalloc.h
    branches/soc-2008-mxcurioni/intern/itasc/Armature.cpp
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_render.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_brush.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_fcurve.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/blender.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fmodifier.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh_validate.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pbvh_bmesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_path_util.h
    branches/soc-2008-mxcurioni/source/blender/blenloader/BLO_readfile.h
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readblenentry.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.h
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/versioning_legacy.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mesh.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mesh_conv.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_polygon.c
    branches/soc-2008-mxcurioni/source/blender/collada/AnimationExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/ArmatureImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/ControllerExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/GeometryExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/MeshImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/SceneExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/editors/animation/fmodifier_ui.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframing.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/pose_slide.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_image.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_anim.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_data.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/meshtools.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_preview.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image_2d.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image_proj.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2008-mxcurioni/source/blender/editors/sound/sound_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_view.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_view.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_colormanagement.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_imbuf_types.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/colormanagement.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/rectop.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_ID.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh_utils.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_skin.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_tree.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_driver.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface_atexit.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_noise.c
    branches/soc-2008-mxcurioni/source/blender/quicktime/apple/qtkit_export.m
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_internal.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/renderdatabase.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureConstraint.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_DeformableGameObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_Engine.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_Engine.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_Action.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ArmatureSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_MeshObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/PyTypeList.cpp
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/blendVideoTex.cpp
    branches/soc-2008-mxcurioni/source/tools/check_style_c.py

Property Changed:
----------------
    branches/soc-2008-mxcurioni/


Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-55357
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-55372

Modified: branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_guardedalloc.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_guardedalloc.h	2013-03-18 21:36:12 UTC (rev 55391)
+++ branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_guardedalloc.h	2013-03-18 21:45:29 UTC (rev 55392)
@@ -165,7 +165,7 @@
 	void MEM_printmemlist(void);
 
 	/** calls the function on all allocated memory blocks. */
-	void MEM_callbackmemlist(void (*func)(void*));
+	void MEM_callbackmemlist(void (*func)(void *));
 
 	/** Print statistics about memory usage */
 	void MEM_printmemlist_stats(void);

Modified: branches/soc-2008-mxcurioni/intern/itasc/Armature.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/itasc/Armature.cpp	2013-03-18 21:36:12 UTC (rev 55391)
+++ branches/soc-2008-mxcurioni/intern/itasc/Armature.cpp	2013-03-18 21:45:29 UTC (rev 55392)
@@ -170,7 +170,7 @@
 {
 	if (m_qCCh >= 0) {
 		double* item;
-		item = (double*)m_cache->getPreviousCacheItem(this, m_qCCh, &timestamp);
+		item = (double *)m_cache->getPreviousCacheItem(this, m_qCCh, &timestamp);
 		if (item && m_qCTs != timestamp) {
 			double* q = m_qKdl(0);
 			memcpy(q, item, m_qKdl.rows()*sizeof(double));
@@ -698,8 +698,8 @@
 		JointConstraint_struct* pConstraint = *it;
 		unsigned int nr, i;
 		for (i=0, nr = pConstraint->segment->second.q_nr; i<pConstraint->v_nr; i++, nr++) {
-			*(double*)&pConstraint->value[i].y = m_qKdl[nr];
-			*(double*)&pConstraint->value[i].ydot = m_qdotKdl[nr];
+			*(double *)&pConstraint->value[i].y = m_qKdl[nr];
+			*(double *)&pConstraint->value[i].ydot = m_qdotKdl[nr];
 		}
 		if (pConstraint->function && (pConstraint->substep || (!timestamp.reiterate && !timestamp.substep))) {
 			(*pConstraint->function)(timestamp, pConstraint->values, pConstraint->v_nr, pConstraint->param);

Modified: branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_render.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_render.py	2013-03-18 21:36:12 UTC (rev 55391)
+++ branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_render.py	2013-03-18 21:45:29 UTC (rev 55392)
@@ -390,10 +390,14 @@
 
         layout.prop(rd, "filepath", text="")
 
-        flow = layout.column_flow()
-        flow.prop(rd, "use_overwrite")
-        flow.prop(rd, "use_placeholder")
-        flow.prop(rd, "use_file_extension")
+        split = layout.split()
+        
+        col = split.column()
+        col.active = not rd.is_movie_format
+        col.prop(rd, "use_overwrite")
+        col.prop(rd, "use_placeholder")
+        
+        split.prop(rd, "use_file_extension")
 
         layout.template_image_settings(image_settings, color_management=False)
 

Modified: branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref.py	2013-03-18 21:36:12 UTC (rev 55391)
+++ branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref.py	2013-03-18 21:45:29 UTC (rev 55392)
@@ -480,6 +480,10 @@
         col.prop(system, "texture_collection_rate", text="Collection Rate")
 
         col.separator()
+
+        col.label(text="Images:")
+        col.prop(system, "image_gpubuffer_limit")
+
         col.separator()
         col.separator()
 

Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h	2013-03-18 21:36:12 UTC (rev 55391)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h	2013-03-18 21:45:29 UTC (rev 55392)
@@ -70,7 +70,7 @@
 #define BKE_READ_FILE_OK                1 /* OK */
 #define BKE_READ_FILE_OK_USERPREFS      2 /* OK, and with new user settings */
 
-int BKE_read_file_from_memory(struct bContext *C, char *filebuf, int filelength, struct ReportList *reports);
+int BKE_read_file_from_memory(struct bContext *C, const void *filebuf, int filelength, struct ReportList *reports);
 int BKE_read_file_from_memfile(struct bContext *C, struct MemFile *memfile, struct ReportList *reports);
 
 int BKE_read_file_userdef(const char *filepath, struct ReportList *reports);
@@ -105,8 +105,8 @@
 	/* copybuffer */
 void BKE_copybuffer_begin(void);
 void BKE_copybuffer_tag_ID(struct ID *id);
-int BKE_copybuffer_save(char *filename, struct ReportList *reports);
-	int BKE_copybuffer_paste(struct bContext *C, char *libname, struct ReportList *reports);
+int BKE_copybuffer_save(const char *filename, struct ReportList *reports);
+	int BKE_copybuffer_paste(struct bContext *C, const char *libname, struct ReportList *reports);
 
 #ifdef __cplusplus
 }

Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_brush.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_brush.h	2013-03-18 21:36:12 UTC (rev 55391)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_brush.h	2013-03-18 21:45:29 UTC (rev 55392)
@@ -72,7 +72,7 @@
 float BKE_brush_sample_tex_3D(const Scene *scene, struct Brush *br, const float point[3],
                               float rgba[4], const int thread, struct ImagePool *pool);
 float BKE_brush_sample_tex_2D(const struct Scene *scene, struct Brush *brush, const float xy[2],
-                              float rgba[4], struct ImagePool *pool);
+                              float rgba[4]);
 void BKE_brush_imbuf_new(const struct Scene *scene, struct Brush *brush, short flt, short texfalloff, int size,
                          struct ImBuf **imbuf, int use_color_correction);
 

Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_fcurve.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_fcurve.h	2013-03-18 21:36:12 UTC (rev 55391)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_fcurve.h	2013-03-18 21:45:29 UTC (rev 55392)
@@ -182,7 +182,7 @@
 
 void fcurve_bake_modifiers(struct FCurve *fcu, int start, int end);
 
-int BKE_fcm_envelope_find_index(struct FCM_EnvelopeData *array, float frame, int arraylen, short *exists);
+int BKE_fcm_envelope_find_index(struct FCM_EnvelopeData *array, float frame, int arraylen, bool *r_exists);
 
 /* ************** F-Curves API ******************** */
 
@@ -200,7 +200,7 @@
 struct FCurve *iter_step_fcurve(struct FCurve *fcu_iter, const char rna_path[]);
 
 /* high level function to get an fcurve from C without having the rna */
-struct FCurve *id_data_find_fcurve(ID *id, void *data, struct StructRNA *type, const char *prop_name, int index, char *driven);
+struct FCurve *id_data_find_fcurve(ID *id, void *data, struct StructRNA *type, const char *prop_name, int index, bool *r_driven);
 
 /* Get list of LinkData's containing pointers to the F-Curves which control the types of data indicated 
  *	e.g.  numMatches = list_find_data_fcurves(matches, &act->curves, "pose.bones[", "MyFancyBone");
@@ -208,12 +208,12 @@
 int list_find_data_fcurves(ListBase *dst, ListBase *src, const char *dataPrefix, const char *dataName);
 
 /* find an f-curve based on an rna property */
-struct FCurve *rna_get_fcurve(struct PointerRNA *ptr, struct PropertyRNA *prop, int rnaindex, struct bAction **action, int *driven);
+struct FCurve *rna_get_fcurve(struct PointerRNA *ptr, struct PropertyRNA *prop, int rnaindex, struct bAction **action, bool *r_driven);
 
 /* Binary search algorithm for finding where to 'insert' BezTriple with given frame number.
  * Returns the index to insert at (data already at that index will be offset if replace is 0)
  */
-int binarysearch_bezt_index(struct BezTriple array[], float frame, int arraylen, short *replace);
+int binarysearch_bezt_index(struct BezTriple array[], float frame, int arraylen, bool *r_replace);
 
 /* get the time extents for F-Curve */
 void calc_fcurve_range(struct FCurve *fcu, float *min, float *max,

Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mesh.h	2013-03-18 21:36:12 UTC (rev 55391)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mesh.h	2013-03-18 21:45:29 UTC (rev 55392)
@@ -81,7 +81,7 @@
 int BKE_mesh_recalc_tessellation(struct CustomData *fdata, struct CustomData *ldata, struct CustomData *pdata,

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list