[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48148] branches/soc-2011-tomato: svn merge ^/trunk/blender -r48140:48147
Campbell Barton
ideasman42 at gmail.com
Thu Jun 21 08:11:04 CEST 2012
Revision: 48148
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48148
Author: campbellbarton
Date: 2012-06-21 06:10:51 +0000 (Thu, 21 Jun 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r48140:48147
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48140
Modified Paths:
--------------
branches/soc-2011-tomato/intern/cycles/app/cycles_xml.cpp
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2011-tomato/source/blender/editors/object/object_group.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2011-tomato/source/blender/python/generic/bpy_internal_import.c
branches/soc-2011-tomato/source/blender/python/generic/bpy_internal_import.h
branches/soc-2011-tomato/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PythonInit.h
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-48140
+ /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-48147
Modified: branches/soc-2011-tomato/intern/cycles/app/cycles_xml.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/app/cycles_xml.cpp 2012-06-21 05:41:06 UTC (rev 48147)
+++ branches/soc-2011-tomato/intern/cycles/app/cycles_xml.cpp 2012-06-21 06:10:51 UTC (rev 48148)
@@ -254,6 +254,16 @@
static void xml_read_integrator(const XMLReadState& state, pugi::xml_node node)
{
Integrator *integrator = state.scene->integrator;
+
+ xml_read_bool(&integrator->progressive, node, "progressive");
+
+ if(!integrator->progressive) {
+ xml_read_int(&integrator->diffuse_samples, node, "diffuse_samples");
+ xml_read_int(&integrator->glossy_samples, node, "glossy_samples");
+ xml_read_int(&integrator->transmission_samples, node, "transmission_samples");
+ xml_read_int(&integrator->ao_samples, node, "ao_samples");
+ xml_read_int(&integrator->mesh_light_samples, node, "mesh_light_samples");
+ }
xml_read_int(&integrator->min_bounce, node, "min_bounce");
xml_read_int(&integrator->max_bounce, node, "max_bounce");
@@ -267,8 +277,10 @@
xml_read_bool(&integrator->transparent_shadows, node, "transparent_shadows");
xml_read_bool(&integrator->no_caustics, node, "no_caustics");
+ xml_read_float(&integrator->blur_glossy, node, "blur_glossy");
xml_read_int(&integrator->seed, node, "seed");
+ xml_read_float(&integrator->sample_clamp, node, "sample_clamp");
}
/* Camera */
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-06-21 05:41:06 UTC (rev 48147)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_game.py 2012-06-21 06:10:51 UTC (rev 48148)
@@ -50,6 +50,8 @@
physics_type = game.physics_type
if physics_type == 'CHARACTER':
+ layout.prop(game, "use_actor")
+ layout.prop(ob, "hide_render", text="Invisible") # out of place but useful
layout.prop(game, "step_height", slider=True)
layout.prop(game, "jump_speed")
layout.prop(game, "fall_speed")
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-48140
+ /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-48147
Modified: branches/soc-2011-tomato/source/blender/editors/object/object_group.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/object/object_group.c 2012-06-21 05:41:06 UTC (rev 48147)
+++ branches/soc-2011-tomato/source/blender/editors/object/object_group.c 2012-06-21 06:10:51 UTC (rev 48148)
@@ -255,9 +255,8 @@
/* item_tmp.icon = ICON_ARMATURE_DATA; */
item_tmp.value = i;
RNA_enum_item_add(&item, &totitem, &item_tmp);
+ i++;
}
-
- i++;
}
RNA_enum_item_end(&item, &totitem);
Property changes on: branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-48140
+ /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-48147
Modified: branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_draw.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_draw.c 2012-06-21 05:41:06 UTC (rev 48147)
+++ branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_draw.c 2012-06-21 06:10:51 UTC (rev 48148)
@@ -202,26 +202,39 @@
{
GroupObject *gob;
+#ifdef USE_GROUP_SELECT
for (gob = gr->gobject.first; gob; gob = gob->next) {
if ((gob->ob->restrictflag & flag) == 0)
return 0;
}
-
return 1;
+#else
+ /* weak but fast */
+ if ((gob = gr->gobject.first))
+ if ((gob->ob->restrictflag & flag) == 0)
+ return 0;
+ return 1;
+#endif
}
-#ifdef USE_GROUP_SELECT
static int group_select_flag(Group *gr)
{
GroupObject *gob;
+#ifdef USE_GROUP_SELECT
for (gob = gr->gobject.first; gob; gob = gob->next)
if ((gob->ob->flag & SELECT))
return 1;
return 0;
+#else
+ /* weak but fast */
+ if ((gob = gr->gobject.first))
+ if (gob->ob->flag & SELECT)
+ return 1;
+ return 0;
+#endif
}
-#endif
void restrictbutton_gr_restrict_flag(void *poin, void *poin2, int flag)
{
@@ -428,25 +441,15 @@
uiBlockSetEmboss(block, UI_EMBOSSN);
-#ifndef USE_GROUP_SELECT
- restrict_bool = FALSE;
-#endif
-
-#ifdef USE_GROUP_SELECT
restrict_bool = group_restrict_flag(gr, OB_RESTRICT_VIEW);
-#endif
bt = uiDefIconBut(block, ICONTOG, 0, restrict_bool ? ICON_RESTRICT_VIEW_ON : ICON_RESTRICT_VIEW_OFF, (int)ar->v2d.cur.xmax - OL_TOG_RESTRICT_VIEWX, (int)te->ys, UI_UNIT_X - 1, UI_UNIT_Y - 1, NULL, 0, 0, 0, 0, "Restrict/Allow visibility in the 3D View");
uiButSetFunc(bt, restrictbutton_gr_restrict_view, scene, gr);
-#ifdef USE_GROUP_SELECT
restrict_bool = group_restrict_flag(gr, OB_RESTRICT_SELECT);
-#endif
bt = uiDefIconBut(block, ICONTOG, 0, restrict_bool ? ICON_RESTRICT_SELECT_ON : ICON_RESTRICT_SELECT_OFF, (int)ar->v2d.cur.xmax - OL_TOG_RESTRICT_SELECTX, (int)te->ys, UI_UNIT_X - 1, UI_UNIT_Y - 1, NULL, 0, 0, 0, 0, "Restrict/Allow selection in the 3D View");
uiButSetFunc(bt, restrictbutton_gr_restrict_select, scene, gr);
-#ifdef USE_GROUP_SELECT
restrict_bool = group_restrict_flag(gr, OB_RESTRICT_RENDER);
-#endif
bt = uiDefIconBut(block, ICONTOG, 0, restrict_bool ? ICON_RESTRICT_RENDER_ON : ICON_RESTRICT_RENDER_OFF, (int)ar->v2d.cur.xmax - OL_TOG_RESTRICT_RENDERX, (int)te->ys, UI_UNIT_X - 1, UI_UNIT_Y - 1, NULL, 0, 0, 0, 0, "Restrict/Allow renderability");
uiButSetFunc(bt, restrictbutton_gr_restrict_render, scene, gr);
@@ -1289,7 +1292,6 @@
}
}
else if (te->idcode == ID_GR) {
-#ifdef USE_GROUP_SELECT
Group *gr = (Group *)tselem->id;
if (group_select_flag(gr)) {
char col[4];
@@ -1299,7 +1301,6 @@
active = 2;
}
-#endif
}
else if (te->idcode == ID_OB) {
Object *ob = (Object *)tselem->id;
Modified: branches/soc-2011-tomato/source/blender/python/generic/bpy_internal_import.c
===================================================================
--- branches/soc-2011-tomato/source/blender/python/generic/bpy_internal_import.c 2012-06-21 05:41:06 UTC (rev 48147)
+++ branches/soc-2011-tomato/source/blender/python/generic/bpy_internal_import.c 2012-06-21 06:10:51 UTC (rev 48148)
@@ -52,6 +52,7 @@
#include "BKE_main.h"
static Main *bpy_import_main = NULL;
+static ListBase bpy_import_main_list;
/* 'builtins' is most likely PyEval_GetBuiltins() */
void bpy_import_init(PyObject *builtins)
@@ -92,6 +93,16 @@
bpy_import_main = maggie;
}
+void bpy_import_main_extra_add(struct Main *maggie)
+{
+ BLI_addhead(&bpy_import_main_list, maggie);
+}
+
+void bpy_import_main_extra_remove(struct Main *maggie)
+{
+ BLI_remlink_safe(&bpy_import_main_list, maggie);
+}
+
/* returns a dummy filename for a textblock so we can tell what file a text block comes from */
void bpy_text_filename_get(char *fn, size_t fn_len, Text *text)
{
@@ -150,6 +161,18 @@
text = BLI_findstring(&maggie->text, txtname, offsetof(ID, name) + 2);
+ if (text) {
+ *found = 1;
+ return bpy_text_import(text);
+ }
+
+ /* If we still haven't found the module try additional modules form bpy_import_main_list */
+ maggie = bpy_import_main_list.first;
+ while (maggie && !text) {
+ text = BLI_findstring(&maggie->text, txtname, offsetof(ID, name) + 2);
+ maggie = maggie->next;
+ }
+
if (!text)
return NULL;
else
Modified: branches/soc-2011-tomato/source/blender/python/generic/bpy_internal_import.h
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list