[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58144] branches/soc-2013-depsgraph_mt: Merging r58125 through r58143 from trunk into soc-2013-depsgraph_mt
Sergey Sharybin
sergey.vfx at gmail.com
Wed Jul 10 11:13:45 CEST 2013
Revision: 58144
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58144
Author: nazgul
Date: 2013-07-10 09:13:45 +0000 (Wed, 10 Jul 2013)
Log Message:
-----------
Merging r58125 through r58143 from trunk into soc-2013-depsgraph_mt
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58125
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58143
Modified Paths:
--------------
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/customdata.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/particle.c
branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_mesh.h
branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_render.h
branches/soc-2013-depsgraph_mt/source/blender/editors/include/UI_interface.h
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_layout.c
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_templates.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_add.c
branches/soc-2013-depsgraph_mt/source/blender/editors/physics/particle_edit.c
branches/soc-2013-depsgraph_mt/source/blender/editors/render/render_internal.c
branches/soc-2013-depsgraph_mt/source/blender/editors/render/render_preview.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-depsgraph_mt/source/blender/editors/util/undo.c
branches/soc-2013-depsgraph_mt/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
branches/soc-2013-depsgraph_mt/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_mesh.c
Property Changed:
----------------
branches/soc-2013-depsgraph_mt/
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-depsgraph_mt
___________________________________________________________________
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
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-58124
+ /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
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-58143
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/DerivedMesh.c 2013-07-10 08:01:06 UTC (rev 58143)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/DerivedMesh.c 2013-07-10 09:13:45 UTC (rev 58144)
@@ -656,21 +656,25 @@
void *DM_get_vert_data(DerivedMesh *dm, int index, int type)
{
+ BLI_assert(index >= 0 && index < dm->getNumVerts(dm));
return CustomData_get(&dm->vertData, index, type);
}
void *DM_get_edge_data(DerivedMesh *dm, int index, int type)
{
+ BLI_assert(index >= 0 && index < dm->getNumEdges(dm));
return CustomData_get(&dm->edgeData, index, type);
}
void *DM_get_tessface_data(DerivedMesh *dm, int index, int type)
{
+ BLI_assert(index >= 0 && index < dm->getNumTessFaces(dm));
return CustomData_get(&dm->faceData, index, type);
}
void *DM_get_poly_data(DerivedMesh *dm, int index, int type)
{
+ BLI_assert(index >= 0 && index < dm->getNumPolys(dm));
return CustomData_get(&dm->polyData, index, type);
}
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/customdata.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/customdata.c 2013-07-10 08:01:06 UTC (rev 58143)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/customdata.c 2013-07-10 09:13:45 UTC (rev 58144)
@@ -2073,6 +2073,8 @@
int offset;
int layer_index;
+ BLI_assert(index >= 0);
+
/* get the layer index of the active layer of type */
layer_index = CustomData_get_active_layer_index(data, type);
if (layer_index < 0) return NULL;
@@ -2088,6 +2090,8 @@
int layer_index;
int offset;
+ BLI_assert(index >= 0 && n >= 0);
+
/* get the layer index of the first layer of type */
layer_index = data->typemap[type];
if (layer_index < 0) return NULL;
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/particle.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/particle.c 2013-07-10 08:01:06 UTC (rev 58143)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/particle.c 2013-07-10 09:13:45 UTC (rev 58144)
@@ -3414,8 +3414,7 @@
OrigSpaceFace *osface;
float (*orcodata)[3];
- int i = pa->num_dmcache == DMCACHE_NOTFOUND ? pa->num : pa->num_dmcache;
-
+ int i = (ELEM(pa->num_dmcache, DMCACHE_ISCHILD, DMCACHE_NOTFOUND)) ? pa->num : pa->num_dmcache;
if (i == -1 || i >= dm->getNumTessFaces(dm)) { unit_m4(mat); return; }
mface = dm->getTessFaceData(dm, i, CD_MFACE);
Modified: branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp 2013-07-10 08:01:06 UTC (rev 58143)
+++ branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp 2013-07-10 09:13:45 UTC (rev 58144)
@@ -47,7 +47,7 @@
operation->setSettings((NodeChroma *)editorsnode->storage);
inputSocketImage->relinkConnections(operationRGBToYCC_Image->getInputSocket(0), 0, graph);
- inputSocketKey->relinkConnections(operationRGBToYCC_Key->getInputSocket(0), 0, graph);
+ inputSocketKey->relinkConnections(operationRGBToYCC_Key->getInputSocket(0), 1, graph);
addLink(graph, operationRGBToYCC_Image->getOutputSocket(), operation->getInputSocket(0));
addLink(graph, operationRGBToYCC_Key->getOutputSocket(), operation->getInputSocket(1));
Modified: branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_mesh.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_mesh.h 2013-07-10 08:01:06 UTC (rev 58143)
+++ branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_mesh.h 2013-07-10 09:13:45 UTC (rev 58144)
@@ -95,6 +95,7 @@
void EDBM_mesh_make(struct ToolSettings *ts, struct Scene *scene, struct Object *ob);
void EDBM_mesh_free(struct BMEditMesh *em);
void EDBM_mesh_load(struct Object *ob);
+struct DerivedMesh *EDBM_mesh_deform_dm_get(struct BMEditMesh *em);
void EDBM_index_arrays_ensure(struct BMEditMesh *em, const char htype);
void EDBM_index_arrays_init(struct BMEditMesh *em, const char htype);
Modified: branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_render.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_render.h 2013-07-10 08:01:06 UTC (rev 58143)
+++ branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_render.h 2013-07-10 09:13:45 UTC (rev 58144)
@@ -52,7 +52,7 @@
void ED_render_engine_area_exit(struct ScrArea *sa);
void ED_render_scene_update(struct Main *bmain, struct Scene *scene, int updated);
-void ED_viewport_render_kill_jobs(const struct bContext *C);
+void ED_viewport_render_kill_jobs(const struct bContext *C, bool free_database);
/* render_preview.c */
Modified: branches/soc-2013-depsgraph_mt/source/blender/editors/include/UI_interface.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/editors/include/UI_interface.h 2013-07-10 08:01:06 UTC (rev 58143)
+++ branches/soc-2013-depsgraph_mt/source/blender/editors/include/UI_interface.h 2013-07-10 09:13:45 UTC (rev 58144)
@@ -236,6 +236,8 @@
BUT_NORMAL = (31 << 9),
BUT_CURVE = (32 << 9),
ICONTOGN = (34 << 9),
+ LISTBOX = (35 << 9),
+ LISTROW = (36 << 9),
TOGBUT = (37 << 9),
OPTION = (38 << 9),
OPTIONN = (39 << 9),
@@ -244,8 +246,6 @@
SEARCH_MENU = (41 << 9),
BUT_EXTRA = (42 << 9),
HSVCIRCLE = (43 << 9),
- LISTBOX = (44 << 9),
- LISTROW = (45 << 9),
HOTKEYEVT = (46 << 9),
BUT_IMAGE = (47 << 9),
HISTOGRAM = (48 << 9),
Modified: branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c 2013-07-10 08:01:06 UTC (rev 58143)
+++ branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c 2013-07-10 09:13:45 UTC (rev 58144)
@@ -2861,7 +2861,7 @@
}
/* keep track of UI_interface.h */
- if (ELEM9(but->type, BLOCK, BUT, LABEL, PULLDOWN, ROUNDBOX, LISTBOX, BUTM, SCROLL, SEPR /* , FTPREVIEW */)) {}
+ if (ELEM8(but->type, BLOCK, BUT, LABEL, PULLDOWN, ROUNDBOX, BUTM, SCROLL, SEPR)) {}
else if (but->type >= SEARCH_MENU) {}
else but->flag |= UI_BUT_UNDO;
Property changes on: branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c:57395-58124
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list