[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61049] branches/vgroup_modifiers: svn merge -r 61026:61048 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Bastien Montagne
montagne29 at wanadoo.fr
Fri Nov 1 15:37:20 CET 2013
Revision: 61049
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61049
Author: mont29
Date: 2013-11-01 14:37:20 +0000 (Fri, 01 Nov 2013)
Log Message:
-----------
svn merge -r 61026:61048 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/vgroup_modifiers/intern/cycles/blender/addon/properties.py
branches/vgroup_modifiers/intern/cycles/render/sky_model.h
branches/vgroup_modifiers/intern/ffmpeg/ffmpeg_compat.h
branches/vgroup_modifiers/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/vgroup_modifiers/intern/guardedalloc/CMakeLists.txt
branches/vgroup_modifiers/release/datafiles/blender_icons.svg
branches/vgroup_modifiers/release/datafiles/blender_icons16.png
branches/vgroup_modifiers/release/datafiles/blender_icons32.png
branches/vgroup_modifiers/release/scripts/startup/bl_operators/view3d.py
branches/vgroup_modifiers/source/blender/blenkernel/BKE_modifier.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_rigidbody.h
branches/vgroup_modifiers/source/blender/blenkernel/intern/anim.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/brush.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/bvhutils.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/cloth.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/editderivedmesh.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/image.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/object.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/particle_system.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/rigidbody.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/writeffmpeg.c
branches/vgroup_modifiers/source/blender/blenlib/BLI_voronoi.h
branches/vgroup_modifiers/source/blender/blenlib/intern/BLI_ghash.c
branches/vgroup_modifiers/source/blender/blenlib/intern/edgehash.c
branches/vgroup_modifiers/source/blender/blenlib/intern/threads.c
branches/vgroup_modifiers/source/blender/blenlib/intern/voronoi.c
branches/vgroup_modifiers/source/blender/blenloader/intern/readfile.c
branches/vgroup_modifiers/source/blender/collada/ArmatureImporter.cpp
branches/vgroup_modifiers/source/blender/compositor/nodes/COM_DespeckleNode.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_DespeckleOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_DespeckleOperation.h
branches/vgroup_modifiers/source/blender/editors/animation/anim_markers.c
branches/vgroup_modifiers/source/blender/editors/animation/drivers.c
branches/vgroup_modifiers/source/blender/editors/armature/armature_edit.c
branches/vgroup_modifiers/source/blender/editors/armature/armature_utils.c
branches/vgroup_modifiers/source/blender/editors/gpencil/gpencil_paint.c
branches/vgroup_modifiers/source/blender/editors/include/ED_render.h
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_knife.c
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_knife_project.c
branches/vgroup_modifiers/source/blender/editors/mesh/mesh_intern.h
branches/vgroup_modifiers/source/blender/editors/mesh/meshtools.c
branches/vgroup_modifiers/source/blender/editors/object/object_lattice.c
branches/vgroup_modifiers/source/blender/editors/object/object_modifier.c
branches/vgroup_modifiers/source/blender/editors/render/render_internal.c
branches/vgroup_modifiers/source/blender/editors/space_file/filelist.c
branches/vgroup_modifiers/source/blender/editors/space_image/space_image.c
branches/vgroup_modifiers/source/blender/editors/space_node/drawnode.c
branches/vgroup_modifiers/source/blender/editors/space_sequencer/sequencer_edit.c
branches/vgroup_modifiers/source/blender/freestyle/intern/geometry/Grid.h
branches/vgroup_modifiers/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp
branches/vgroup_modifiers/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/Curve.h
branches/vgroup_modifiers/source/blender/freestyle/intern/stroke/Stroke.h
branches/vgroup_modifiers/source/blender/freestyle/intern/system/Id.h
branches/vgroup_modifiers/source/blender/freestyle/intern/system/TimeUtils.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/SteerableViewMap.h
branches/vgroup_modifiers/source/blender/freestyle/intern/view_map/ViewMap.h
branches/vgroup_modifiers/source/blender/imbuf/intern/util.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_nodetree.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_scene.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_tracking.c
branches/vgroup_modifiers/source/blender/python/intern/bpy_app_handlers.c
branches/vgroup_modifiers/source/blender/render/intern/source/pipeline.c
branches/vgroup_modifiers/source/blender/windowmanager/WM_api.h
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_jobs.c
branches/vgroup_modifiers/source/creator/creator.c
branches/vgroup_modifiers/source/tools/spell_check_source.py
branches/vgroup_modifiers/source/tools/spell_check_source_config.py
Property Changed:
----------------
branches/vgroup_modifiers/
Property changes on: branches/vgroup_modifiers
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_dev:58091-58422
/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,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260,59942,60073,60094,60096,60105
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/branches/soc-2013-rigid_body_sim:59888,60311
/tags/blender-2.67b-release/blender:57122
/trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-43541,43543-61026
+ /branches/ge_dev:58091-58422
/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,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260,59942,60073,60094,60096,60105
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/branches/soc-2013-rigid_body_sim:59888,60311
/tags/blender-2.67b-release/blender:57122
/trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-43541,43543-61048
Modified: branches/vgroup_modifiers/intern/cycles/blender/addon/properties.py
===================================================================
--- branches/vgroup_modifiers/intern/cycles/blender/addon/properties.py 2013-11-01 13:46:55 UTC (rev 61048)
+++ branches/vgroup_modifiers/intern/cycles/blender/addon/properties.py 2013-11-01 14:37:20 UTC (rev 61049)
@@ -253,26 +253,26 @@
name="Max Bounces",
description="Total maximum number of bounces",
min=0, max=1024,
- default=8,
+ default=12,
)
cls.diffuse_bounces = IntProperty(
name="Diffuse Bounces",
description="Maximum number of diffuse reflection bounces, bounded by total maximum",
min=0, max=1024,
- default=128,
+ default=4,
)
cls.glossy_bounces = IntProperty(
name="Glossy Bounces",
description="Maximum number of glossy reflection bounces, bounded by total maximum",
min=0, max=1024,
- default=128,
+ default=4,
)
cls.transmission_bounces = IntProperty(
name="Transmission Bounces",
description="Maximum number of transmission bounces, bounded by total maximum",
min=0, max=1024,
- default=128,
+ default=12,
)
cls.transparent_min_bounces = IntProperty(
Modified: branches/vgroup_modifiers/intern/cycles/render/sky_model.h
===================================================================
--- branches/vgroup_modifiers/intern/cycles/render/sky_model.h 2013-11-01 13:46:55 UTC (rev 61048)
+++ branches/vgroup_modifiers/intern/cycles/render/sky_model.h 2013-11-01 14:37:20 UTC (rev 61049)
@@ -136,7 +136,7 @@
See the notes about the "Alien World" functionality provided further down for a
discussion of the usefulness and limits of that second initalisation function.
-Sky model states that have been initialised with either function behave in a
+Sky model states that have been initialized with either function behave in a
completely identical fashion during use and cleanup.
Using the model to generate skydome samples
Modified: branches/vgroup_modifiers/intern/ffmpeg/ffmpeg_compat.h
===================================================================
--- branches/vgroup_modifiers/intern/ffmpeg/ffmpeg_compat.h 2013-11-01 13:46:55 UTC (rev 61048)
+++ branches/vgroup_modifiers/intern/ffmpeg/ffmpeg_compat.h 2013-11-01 14:37:20 UTC (rev 61049)
@@ -2,7 +2,7 @@
* compatibility macros to make every ffmpeg installation appear
* like the most current installation (wrapping some functionality sometimes)
* it also includes all ffmpeg header files at once, no need to do it
- * seperately.
+ * separately.
*
* Copyright (c) 2011 Peter Schlaile
*
Modified: branches/vgroup_modifiers/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/vgroup_modifiers/intern/ghost/intern/GHOST_SystemCocoa.mm 2013-11-01 13:46:55 UTC (rev 61048)
+++ branches/vgroup_modifiers/intern/ghost/intern/GHOST_SystemCocoa.mm 2013-11-01 14:37:20 UTC (rev 61049)
@@ -525,7 +525,7 @@
return NSTerminateCancel;
}
-// To avoid cancelling a log off process, we must use Cocoa termination process
+// To avoid canceling a log off process, we must use Cocoa termination process
// And this function is the only chance to perform clean up
// So WM_exit needs to be called directly, as the event loop will never run before termination
- (void)applicationWillTerminate:(NSNotification *)aNotification
Modified: branches/vgroup_modifiers/intern/guardedalloc/CMakeLists.txt
===================================================================
--- branches/vgroup_modifiers/intern/guardedalloc/CMakeLists.txt 2013-11-01 13:46:55 UTC (rev 61048)
+++ branches/vgroup_modifiers/intern/guardedalloc/CMakeLists.txt 2013-11-01 14:37:20 UTC (rev 61049)
@@ -39,6 +39,9 @@
MEM_guardedalloc.h
./intern/mallocn_intern.h
+
+ # only so the header is known by cmake
+ ../atomic/atomic_ops.h
)
if(WIN32 AND NOT UNIX)
Modified: branches/vgroup_modifiers/release/datafiles/blender_icons.svg
===================================================================
(Binary files differ)
Modified: branches/vgroup_modifiers/release/datafiles/blender_icons16.png
===================================================================
(Binary files differ)
Modified: branches/vgroup_modifiers/release/datafiles/blender_icons32.png
===================================================================
(Binary files differ)
Modified: branches/vgroup_modifiers/release/scripts/startup/bl_operators/view3d.py
===================================================================
--- branches/vgroup_modifiers/release/scripts/startup/bl_operators/view3d.py 2013-11-01 13:46:55 UTC (rev 61048)
+++ branches/vgroup_modifiers/release/scripts/startup/bl_operators/view3d.py 2013-11-01 14:37:20 UTC (rev 61049)
@@ -29,6 +29,11 @@
bl_label = "Extrude Individual and Move"
bl_idname = "view3d.edit_mesh_extrude_individual_move"
+ @classmethod
+ def poll(cls, context):
+ obj = context.active_object
+ return obj.mode == 'EDIT'
+
def execute(self, context):
mesh = context.object.data
select_mode = context.tool_settings.mesh_select_mode
@@ -62,6 +67,11 @@
bl_label = "Extrude and Move on Normals"
bl_idname = "view3d.edit_mesh_extrude_move_normal"
+ @classmethod
+ def poll(cls, context):
+ obj = context.active_object
+ return obj.mode == 'EDIT'
+
@staticmethod
def extrude_region(context, use_vert_normals):
mesh = context.object.data
@@ -107,6 +117,11 @@
bl_label = "Extrude and Move on Individual Normals"
bl_idname = "view3d.edit_mesh_extrude_move_shrink_fatten"
+ @classmethod
+ def poll(cls, context):
+ obj = context.active_object
+ return obj.mode == 'EDIT'
+
def execute(self, context):
return VIEW3D_OT_edit_mesh_extrude_move.extrude_region(context, True)
Modified: branches/vgroup_modifiers/source/blender/blenkernel/BKE_modifier.h
===================================================================
--- branches/vgroup_modifiers/source/blender/blenkernel/BKE_modifier.h 2013-11-01 13:46:55 UTC (rev 61048)
+++ branches/vgroup_modifiers/source/blender/blenkernel/BKE_modifier.h 2013-11-01 14:37:20 UTC (rev 61049)
@@ -357,6 +357,7 @@
bool modifiers_isCorrectableDeformed(struct Scene *scene, struct Object *ob);
void modifier_freeTemporaryData(struct ModifierData *md);
bool modifiers_isPreview(struct Object *ob);
+void modifier_skin_customdata_ensure(struct Object *ob);
typedef struct CDMaskLink {
struct CDMaskLink *next;
Modified: branches/vgroup_modifiers/source/blender/blenkernel/BKE_rigidbody.h
===================================================================
--- branches/vgroup_modifiers/source/blender/blenkernel/BKE_rigidbody.h 2013-11-01 13:46:55 UTC (rev 61048)
+++ branches/vgroup_modifiers/source/blender/blenkernel/BKE_rigidbody.h 2013-11-01 14:37:20 UTC (rev 61049)
@@ -57,7 +57,7 @@
/* -------------- */
/* Setup */
-/* create Blender-side settings data - physics objects not initialised yet */
+/* create Blender-side settings data - physics objects not initialized yet */
struct RigidBodyWorld *BKE_rigidbody_create_world(struct Scene *scene);
struct RigidBodyOb *BKE_rigidbody_create_object(struct Scene *scene, struct Object *ob, short type);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list