[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47202] branches/soc-2011-tomato: svn merge ^/trunk/blender -r47184:47201
Campbell Barton
ideasman42 at gmail.com
Wed May 30 06:48:17 CEST 2012
Revision: 47202
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47202
Author: campbellbarton
Date: 2012-05-30 04:48:10 +0000 (Wed, 30 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r47184:47201
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47184
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/release/scripts/startup/bl_operators/object.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/collision.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/editors/include/ED_object.h
branches/soc-2011-tomato/source/blender/editors/object/object_relations.c
branches/soc-2011-tomato/source/blender/editors/space_api/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-tomato/source/blender/quicktime/apple/quicktime_import.c
branches/soc-2011-tomato/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
Removed Paths:
-------------
branches/soc-2011-tomato/source/blender/editors/space_api/space.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
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/vgroup_modifiers:38694-39989
/trunk/blender:36831-47184
+ /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/vgroup_modifiers:38694-39989
/trunk/blender:36831-47201
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2012-05-30 04:26:31 UTC (rev 47201)
+++ branches/soc-2011-tomato/CMakeLists.txt 2012-05-30 04:48:10 UTC (rev 47202)
@@ -237,12 +237,7 @@
option(WITH_CYCLES "Enable cycles Render Engine" ON)
option(WITH_CYCLES_TEST "Build cycles test application" OFF)
option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
-if(WIN32 AND NOT CMAKE_CL_64 AND NOT WITH_MINGW64)
- set(PLATFORM_DEFAULT sm_20 sm_21)
-else()
- set(PLATFORM_DEFAULT sm_13 sm_20 sm_21)
-endif()
-set(CYCLES_CUDA_BINARIES_ARCH ${PLATFORM_DEFAULT} CACHE STRING "CUDA architectures to build binaries for")
+set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 CACHE STRING "CUDA architectures to build binaries for")
mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
unset(PLATFORM_DEFAULT)
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_operators/object.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_operators/object.py 2012-05-30 04:26:31 UTC (rev 47201)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_operators/object.py 2012-05-30 04:48:10 UTC (rev 47202)
@@ -34,7 +34,7 @@
pattern = StringProperty(
name="Pattern",
- description="Name filter using '*' and '?' wildcard chars",
+ description="Name filter using '*', '?' and '[abc]' unix style wildcards",
maxlen=64,
default="*",
)
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_game.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_game.py 2012-05-30 04:26:31 UTC (rev 47201)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_game.py 2012-05-30 04:48:10 UTC (rev 47202)
@@ -622,6 +622,14 @@
col.prop(gs, "logic_step_max", text="Max")
col = layout.column()
+ col.label(text="Physics Deactivation:")
+ sub = col.row(align=True)
+ sub.prop(gs, "deactivation_linear_threshold", text="Linear Threshold")
+ sub.prop(gs, "deactivation_angular_threshold", text="Angular Threshold")
+ sub = col.row()
+ sub.prop(gs, "deactivation_time", text="Time")
+
+ col = layout.column()
col.prop(gs, "use_occlusion_culling", text="Occlusion Culling")
sub = col.column()
sub.active = gs.use_occlusion_culling
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h 2012-05-30 04:26:31 UTC (rev 47201)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h 2012-05-30 04:48:10 UTC (rev 47202)
@@ -42,7 +42,7 @@
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 263
-#define BLENDER_SUBVERSION 7
+#define BLENDER_SUBVERSION 8
#define BLENDER_MINVERSION 250
#define BLENDER_MINSUBVERSION 0
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/collision.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/collision.c 2012-05-30 04:26:31 UTC (rev 47201)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/collision.c 2012-05-30 04:48:10 UTC (rev 47202)
@@ -332,7 +332,7 @@
// stay on the safe side and clamp repulse
float repulse = d*1.0f/spf;
- float impulse = repulse / ( 1.0f + w1*w1 + w2*w2 + w3*w3 ); // original 2.0 / 0.25
+ float impulse = repulse / (3.0f * ( 1.0f + w1*w1 + w2*w2 + w3*w3 )); // original 2.0 / 0.25
VECADDMUL ( i1, collpair->normal, impulse );
VECADDMUL ( i2, collpair->normal, impulse );
VECADDMUL ( i3, collpair->normal, impulse );
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c 2012-05-30 04:26:31 UTC (rev 47201)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c 2012-05-30 04:48:10 UTC (rev 47202)
@@ -517,6 +517,9 @@
sce->gm.maxlogicstep = 5;
sce->gm.physubstep = 1;
sce->gm.maxphystep = 5;
+ sce->gm.lineardeactthreshold = 0.8f;
+ sce->gm.angulardeactthreshold = 1.0f;
+ sce->gm.deactivationtime = 0.0f;
sce->gm.flag = GAME_DISPLAY_LISTS;
sce->gm.matmode = GAME_MAT_MULTITEX;
Modified: branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c 2012-05-30 04:26:31 UTC (rev 47201)
+++ branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c 2012-05-30 04:48:10 UTC (rev 47202)
@@ -7315,9 +7315,9 @@
if (main->versionfile < 263) {
/* set fluidsim rate. the version patch for this in 2.62 was wrong, so
- * try to correct it, if rate is 0.0 that's likely not intentional */
+ try to correct it, if rate is 0.0 that's likely not intentional */
Object *ob;
-
+
for (ob = main->object.first; ob; ob = ob->id.next) {
ModifierData *md;
for (md = ob->modifiers.first; md; md = md->next) {
@@ -7646,6 +7646,19 @@
}
}
+ if (main->versionfile < 263 || (main->versionfile == 263 && main->subversionfile < 8))
+ {
+ /* set new deactivation values for game settings */
+ Scene *sce;
+
+ for (sce = main->scene.first; sce; sce = sce->id.next) {
+ /* Game Settings */
+ sce->gm.lineardeactthreshold = 0.8f;
+ sce->gm.angulardeactthreshold = 1.0f;
+ sce->gm.deactivationtime = 2.0f;
+ }
+ }
+
/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
/* WATCH IT 2!: Userdef struct init has to be in editors/interface/resources.c! */
{
Modified: branches/soc-2011-tomato/source/blender/editors/include/ED_object.h
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/include/ED_object.h 2012-05-30 04:26:31 UTC (rev 47201)
+++ branches/soc-2011-tomato/source/blender/editors/include/ED_object.h 2012-05-30 04:48:10 UTC (rev 47202)
@@ -85,8 +85,8 @@
extern struct EnumPropertyItem prop_make_parent_types[];
int ED_object_parent_set(struct ReportList *reports, struct Main *bmain, struct Scene *scene, struct Object *ob, struct Object *par, int partype);
-void ED_object_parent_clear(struct bContext *C, int type);
-struct Base *ED_object_scene_link(struct ReportList *reports, struct Scene *scene, struct Object *ob);
+void ED_object_parent_clear(struct Object *ob, int type);
+struct Base *ED_object_scene_link(struct Scene *scene, struct Object *ob);
/* generic editmode keys like pet
* do_pet
Property changes on: branches/soc-2011-tomato/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/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-47184
+ /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/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-47201
Modified: branches/soc-2011-tomato/source/blender/editors/object/object_relations.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/object/object_relations.c 2012-05-30 04:26:31 UTC (rev 47201)
+++ branches/soc-2011-tomato/source/blender/editors/object/object_relations.c 2012-05-30 04:48:10 UTC (rev 47202)
@@ -424,27 +424,35 @@
{0, NULL, 0, NULL, NULL}
};
-void ED_object_parent_clear(bContext *C, int type)
+void ED_object_parent_clear(Object *ob, int type)
{
+
+ if (ob->parent == NULL)
+ return;
+
+ if (type == 0) {
+ ob->parent = NULL;
+ }
+ else if (type == 1) {
+ ob->parent = NULL;
+ BKE_object_apply_mat4(ob, ob->obmat, TRUE, FALSE);
+ }
+ else if (type == 2)
+ unit_m4(ob->parentinv);
+
+ ob->recalc |= OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME;
+}
+
+/* note, poll should check for editable scene */
+static int parent_clear_exec(bContext *C, wmOperator *op)
+{
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list