[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58556] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Wed Jul 24 01:30:52 CEST 2013
Revision: 58556
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58556
Author: gdh
Date: 2013-07-23 23:30:51 +0000 (Tue, 23 Jul 2013)
Log Message:
-----------
Merged trunk into branch. Includes r58510 to r58555.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58510
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58555
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_random.h
branches/soc-2013-cycles_mblur/release/datafiles/splash.png
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_blender.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_global.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_pbvh.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/CMakeLists.txt
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/anim.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/material.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/multires.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pbvh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pbvh_intern.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/property.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/text.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/texture.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_bitmap.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_string_utf8.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/path_util.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/storage.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/string.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/string_utf8.c
branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/readfile.c
branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/writefile.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/CMakeLists.txt
branches/soc-2013-cycles_mblur/source/blender/compositor/intern/COM_SocketReader.h
branches/soc-2013-cycles_mblur/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ConvertColorToValueProg.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MathBaseOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixAddOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixBurnOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixColorOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixDivideOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixHueOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixLightenOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixScreenOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixValueOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/editors/armature/armature_skinning.c
branches/soc-2013-cycles_mblur/source/blender/editors/curve/editcurve.c
branches/soc-2013-cycles_mblur/source/blender/editors/curve/editfont.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editface.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/meshtools.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_lattice.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_modifier.c
branches/soc-2013-cycles_mblur/source/blender/editors/render/render_opengl.c
branches/soc-2013-cycles_mblur/source/blender/editors/screen/screen_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_hide.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_vertex_proj.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_add.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_intern.h
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/space_node.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_iterators.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-cycles_mblur/source/blender/editors/util/crazyspace.c
branches/soc-2013-cycles_mblur/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2013-cycles_mblur/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/thumbs.c
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_ocean.c
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2013-cycles_mblur/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2013-cycles_mblur/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2013-cycles_mblur/source/gameengine/Expressions/FloatValue.cpp
branches/soc-2013-cycles_mblur/source/gameengine/Expressions/IntValue.cpp
branches/soc-2013-cycles_mblur/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2013-cycles_mblur/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
Removed Paths:
-------------
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_bmesh.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/BME_bevel.c
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58509
+ /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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58555
Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_random.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_random.h 2013-07-23 19:31:49 UTC (rev 58555)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_random.h 2013-07-23 23:30:51 UTC (rev 58556)
@@ -141,11 +141,13 @@
int p = *rng + dimension;
cmj_sample_2D(sample, num_samples, p, fx, fy);
}
+ else
#endif
-
- /* sobol */
- *fx = path_rng_1D(kg, rng, sample, num_samples, dimension);
- *fy = path_rng_1D(kg, rng, sample, num_samples, dimension + 1);
+ {
+ /* sobol */
+ *fx = path_rng_1D(kg, rng, sample, num_samples, dimension);
+ *fy = path_rng_1D(kg, rng, sample, num_samples, dimension + 1);
+ }
}
__device_inline void path_rng_init(KernelGlobals *kg, __global uint *rng_state, int sample, int num_samples, RNG *rng, int x, int y, float *fx, float *fy)
Modified: branches/soc-2013-cycles_mblur/release/datafiles/splash.png
===================================================================
(Binary files differ)
Modified: branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_data_modifier.py 2013-07-23 19:31:49 UTC (rev 58555)
+++ branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_data_modifier.py 2013-07-23 23:30:51 UTC (rev 58556)
@@ -715,10 +715,12 @@
col = split.column()
col.label(text="Origin:")
col.prop(md, "origin", text="")
- sub = col.column()
- sub.active = (md.origin is not None)
- sub.prop(md, "use_relative")
+ if md.deform_method in {'TAPER', 'STRETCH', 'TWIST'}:
+ col.label(text="Lock:")
+ col.prop(md, "lock_x")
+ col.prop(md, "lock_y")
+
col = split.column()
col.label(text="Deform:")
if md.deform_method in {'TAPER', 'STRETCH'}:
@@ -726,9 +728,6 @@
else:
col.prop(md, "angle")
col.prop(md, "limits", slider=True)
- if md.deform_method in {'TAPER', 'STRETCH', 'TWIST'}:
- col.prop(md, "lock_x")
- col.prop(md, "lock_y")
def SMOKE(self, layout, ob, md):
layout.label(text="Settings can be found inside the Physics context")
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_DerivedMesh.h
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_DerivedMesh.h 2013-07-23 19:31:49 UTC (rev 58555)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_DerivedMesh.h 2013-07-23 23:30:51 UTC (rev 58556)
@@ -152,6 +152,11 @@
DM_DRAW_ALWAYS_SMOOTH = 2
} DMDrawFlag;
+typedef enum DMForeachFlag {
+ DM_FOREACH_NOP = 0,
+ DM_FOREACH_USE_NORMAL = (1 << 0), /* foreachMappedVert, foreachMappedFaceCenter */
+} DMForeachFlag;
+
typedef enum DMDirtyFlag {
/* dm has valid tessellated faces, but tessellated CDDATA need to be updated. */
DM_DIRTY_TESS_CDLAYERS = 1 << 0,
@@ -285,7 +290,8 @@
void (*foreachMappedVert)(DerivedMesh *dm,
void (*func)(void *userData, int index, const float co[3],
const float no_f[3], const short no_s[3]),
- void *userData);
+ void *userData,
+ DMForeachFlag flag);
/** Iterate over each mapped edge in the derived mesh, calling the
* given function with the original edge and the mapped edge's new
@@ -303,7 +309,8 @@
void (*foreachMappedFaceCenter)(DerivedMesh *dm,
void (*func)(void *userData, int index,
const float cent[3], const float no[3]),
- void *userData);
+ void *userData,
+ DMForeachFlag flag);
/** Iterate over all vertex points, calling DO_MINMAX with given args.
*
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_blender.h 2013-07-23 19:31:49 UTC (rev 58555)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_blender.h 2013-07-23 23:30:51 UTC (rev 58556)
@@ -42,7 +42,7 @@
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 268
-#define BLENDER_SUBVERSION 0
+#define BLENDER_SUBVERSION 1
/* 262 was the last editmesh release but it has compatibility code for bmesh data */
#define BLENDER_MINVERSION 262
@@ -50,7 +50,7 @@
/* used by packaging tools */
/* can be left blank, otherwise a,b,c... etc with no quotes */
-#define BLENDER_VERSION_CHAR
+#define BLENDER_VERSION_CHAR a
/* alpha/beta/rc/release, docs use this */
#define BLENDER_VERSION_CYCLE alpha
Deleted: branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_bmesh.h
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_bmesh.h 2013-07-23 19:31:49 UTC (rev 58555)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_bmesh.h 2013-07-23 23:30:51 UTC (rev 58556)
@@ -1,98 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2004 Blender Foundation.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): Geoffrey Bantle.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef __BKE_BMESH_H__
-#define __BKE_BMESH_H__
-
-/** \file BKE_bmesh.h
- * \ingroup bke
- * \since January 2007
- * \brief BMesh modeler structure and functions.
- *
- */
-
-/*NOTE: this is the bmesh 1.0 code. it's completely outdated.*/
-
-/* uncomment to use the new bevel operator as a modifier */
-#define USE_BM_BEVEL_OP_AS_MOD
-
-/* bevel tool defines */
-/* element flags */
-#define BME_BEVEL_ORIG 1
-#define BME_BEVEL_BEVEL (1 << 1)
-#define BME_BEVEL_NONMAN (1 << 2)
-#define BME_BEVEL_WIRE (1 << 3)
-
-/* tool options */
-#define BME_BEVEL_SELECT 1
-#define BME_BEVEL_VERT (1 << 1)
-#define BME_BEVEL_RADIUS (1 << 2)
-#define BME_BEVEL_ANGLE (1 << 3)
-#define BME_BEVEL_WEIGHT (1 << 4)
-#define BME_BEVEL_VGROUP (1 << 5)
-//~ #define BME_BEVEL_EWEIGHT (1<<4)
-//~ #define BME_BEVEL_VWEIGHT (1<<5)
-#define BME_BEVEL_PERCENT (1 << 6)
-#define BME_BEVEL_EMIN (1 << 7)
-#define BME_BEVEL_EMAX (1 << 8)
-#define BME_BEVEL_RUNNING (1 << 9)
-#define BME_BEVEL_RES (1 << 10)
-
-#define BME_BEVEL_EVEN (1 << 11) /* this is a new setting not related to old (trunk bmesh bevel code) but adding
- * here because they are mixed - campbell */
-#define BME_BEVEL_DIST (1 << 12) /* same as above */
-
-#define BME_BEVEL_OVERLAP_OK (1 << 13)
-
-typedef struct BME_TransData {
- struct BMesh *bm; /* the bmesh the vert belongs to */
- struct BMVert *v; /* pointer to the vert this tdata applies to */
- float co[3]; /* the original coordinate */
- float org[3]; /* the origin */
- float vec[3]; /* a directional vector; always, always normalize! */
- void *loc; /* a pointer to the data to transform (likely the vert's cos) */
- float factor; /* primary scaling factor; also accumulates number of weighted edges for beveling tool */
- float weight; /* another scaling factor; used primarily for propogating vertex weights to transforms; */
- /* weight is also used across recursive bevels to help with the math */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list