[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15399] branches/apricot/source: svn merge -r15389:HEAD https://svn.blender.org/svnroot/bf-blender/trunk /blender/
Campbell Barton
ideasman42 at gmail.com
Tue Jul 1 19:01:18 CEST 2008
Revision: 15399
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15399
Author: campbellbarton
Date: 2008-07-01 19:01:14 +0200 (Tue, 01 Jul 2008)
Log Message:
-----------
svn merge -r15389:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender/
Modified Paths:
--------------
branches/apricot/source/blender/python/api2_2x/Lamp.c
branches/apricot/source/blender/src/buttons_logic.c
branches/apricot/source/gameengine/Converter/BL_ActionActuator.cpp
branches/apricot/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/apricot/source/gameengine/Ketsji/BL_Shader.cpp
branches/apricot/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
branches/apricot/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
branches/apricot/source/gameengine/Ketsji/KX_Camera.cpp
branches/apricot/source/gameengine/Ketsji/KX_GameObject.cpp
branches/apricot/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/apricot/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
branches/apricot/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/apricot/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/apricot/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/apricot/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
Modified: branches/apricot/source/blender/python/api2_2x/Lamp.c
===================================================================
--- branches/apricot/source/blender/python/api2_2x/Lamp.c 2008-07-01 16:43:46 UTC (rev 15398)
+++ branches/apricot/source/blender/python/api2_2x/Lamp.c 2008-07-01 17:01:14 UTC (rev 15399)
@@ -1520,12 +1520,11 @@
char *type = PyString_AsString(value);
PyObject *arg, *error;
- /* parse string argument */
-
- if( !value )
- return ( EXPP_ReturnPyObjError( PyExc_TypeError,
- "expected string argument" ) );
-
+ /* parse string argument */
+ if( !type )
+ return EXPP_ReturnPyObjError ( PyExc_TypeError,
+ "expected string argument" );
+
/* check for valid arguments, set type accordingly */
if( !strcmp( type, "Lamp" ) )
@@ -1546,7 +1545,7 @@
/* build tuple, call wrapper */
- arg = Py_BuildValue( "(i)", type );
+ arg = Py_BuildValue( "(i)", self->lamp->type );
error = EXPP_setterWrapper ( (void *)self, arg, (setter)Lamp_setType );
Py_DECREF ( arg );
return error;
Modified: branches/apricot/source/blender/src/buttons_logic.c
===================================================================
--- branches/apricot/source/blender/src/buttons_logic.c 2008-07-01 16:43:46 UTC (rev 15398)
+++ branches/apricot/source/blender/src/buttons_logic.c 2008-07-01 17:01:14 UTC (rev 15399)
@@ -387,7 +387,6 @@
bSensor *sens;
bController *cont;
bActuator *act;
- Base *base;
Object *ob;
int didit, bit;
@@ -443,16 +442,14 @@
break;
case B_ADD_SENS:
- base= FIRSTBASE;
- while(base) {
- if(base->object->scaflag & OB_ADDSENS) {
- base->object->scaflag &= ~OB_ADDSENS;
+ for(ob=G.main->object.first; ob; ob=ob->id.next) {
+ if(ob->scaflag & OB_ADDSENS) {
+ ob->scaflag &= ~OB_ADDSENS;
sens= new_sensor(SENS_ALWAYS);
- BLI_addtail(&(base->object->sensors), sens);
+ BLI_addtail(&(ob->sensors), sens);
make_unique_prop_names(sens->name);
- base->object->scaflag |= OB_SHOWSENS;
+ ob->scaflag |= OB_SHOWSENS;
}
- base= base->next;
}
BIF_undo_push("Add sensor");
@@ -460,9 +457,8 @@
break;
case B_CHANGE_SENS:
- base= FIRSTBASE;
- while(base) {
- sens= base->object->sensors.first;
+ for(ob=G.main->object.first; ob; ob=ob->id.next) {
+ sens= ob->sensors.first;
while(sens) {
if(sens->type != sens->otype) {
init_sensor(sens);
@@ -471,43 +467,39 @@
}
sens= sens->next;
}
- base= base->next;
}
allqueue(REDRAWBUTSLOGIC, 0);
break;
case B_DEL_SENS:
- base= FIRSTBASE;
- while(base) {
- sens= base->object->sensors.first;
+ for(ob=G.main->object.first; ob; ob=ob->id.next) {
+ sens= ob->sensors.first;
while(sens) {
if(sens->flag & SENS_DEL) {
- BLI_remlink(&(base->object->sensors), sens);
+ BLI_remlink(&(ob->sensors), sens);
free_sensor(sens);
break;
}
sens= sens->next;
}
- base= base->next;
}
BIF_undo_push("Delete sensor");
allqueue(REDRAWBUTSLOGIC, 0);
break;
case B_ADD_CONT:
- base= FIRSTBASE;
- while(base) {
- if(base->object->scaflag & OB_ADDCONT) {
- base->object->scaflag &= ~OB_ADDCONT;
+ for(ob=G.main->object.first; ob; ob=ob->id.next) {
+ if(ob->scaflag & OB_ADDCONT) {
+ ob->scaflag &= ~OB_ADDCONT;
cont= new_controller(CONT_LOGIC_AND);
make_unique_prop_names(cont->name);
- base->object->scaflag |= OB_SHOWCONT;
- BLI_addtail(&(base->object->controllers), cont);
+ ob->scaflag |= OB_SHOWCONT;
+ BLI_addtail(&(ob->controllers), cont);
/* set the controller state mask from the current object state.
A controller is always in a single state, so select the lowest bit set
from the object state */
for (bit=0; bit<32; bit++) {
- if (base->object->state & (1<<bit))
+ if (ob->state & (1<<bit))
break;
}
cont->state_mask = (1<<bit);
@@ -516,42 +508,36 @@
cont->state_mask = 1;
}
}
- base= base->next;
}
BIF_undo_push("Add controller");
allqueue(REDRAWBUTSLOGIC, 0);
break;
case B_SET_STATE_BIT:
- base= FIRSTBASE;
- while(base) {
- if(base->object->scaflag & OB_SETSTBIT) {
- base->object->scaflag &= ~OB_SETSTBIT;
- base->object->state = 0x3FFFFFFF;
+ for(ob=G.main->object.first; ob; ob=ob->id.next) {
+ if(ob->scaflag & OB_SETSTBIT) {
+ ob->scaflag &= ~OB_SETSTBIT;
+ ob->state = 0x3FFFFFFF;
}
- base= base->next;
}
allqueue(REDRAWBUTSLOGIC, 0);
break;
case B_INIT_STATE_BIT:
- base= FIRSTBASE;
- while(base) {
- if(base->object->scaflag & OB_INITSTBIT) {
- base->object->scaflag &= ~OB_INITSTBIT;
- base->object->state = base->object->init_state;
- if (!base->object->state)
- base->object->state = 1;
+ for(ob=G.main->object.first; ob; ob=ob->id.next) {
+ if(ob->scaflag & OB_INITSTBIT) {
+ ob->scaflag &= ~OB_INITSTBIT;
+ ob->state = ob->init_state;
+ if (!ob->state)
+ ob->state = 1;
}
- base= base->next;
}
allqueue(REDRAWBUTSLOGIC, 0);
break;
case B_CHANGE_CONT:
- base= FIRSTBASE;
- while(base) {
- cont= base->object->controllers.first;
+ for(ob=G.main->object.first; ob; ob=ob->id.next) {
+ cont= ob->controllers.first;
while(cont) {
if(cont->type != cont->otype) {
init_controller(cont);
@@ -560,51 +546,45 @@
}
cont= cont->next;
}
- base= base->next;
}
allqueue(REDRAWBUTSLOGIC, 0);
break;
case B_DEL_CONT:
- base= FIRSTBASE;
- while(base) {
- cont= base->object->controllers.first;
+ for(ob=G.main->object.first; ob; ob=ob->id.next) {
+ cont= ob->controllers.first;
while(cont) {
if(cont->flag & CONT_DEL) {
- BLI_remlink(&(base->object->controllers), cont);
+ BLI_remlink(&(ob->controllers), cont);
unlink_controller(cont);
free_controller(cont);
break;
}
cont= cont->next;
}
- base= base->next;
}
BIF_undo_push("Delete controller");
allqueue(REDRAWBUTSLOGIC, 0);
break;
case B_ADD_ACT:
- base= FIRSTBASE;
- while(base) {
- if(base->object->scaflag & OB_ADDACT) {
- base->object->scaflag &= ~OB_ADDACT;
+ for(ob=G.main->object.first; ob; ob=ob->id.next) {
+ if(ob->scaflag & OB_ADDACT) {
+ ob->scaflag &= ~OB_ADDACT;
act= new_actuator(ACT_OBJECT);
make_unique_prop_names(act->name);
- BLI_addtail(&(base->object->actuators), act);
- base->object->scaflag |= OB_SHOWACT;
+ BLI_addtail(&(ob->actuators), act);
+ ob->scaflag |= OB_SHOWACT;
}
- base= base->next;
}
BIF_undo_push("Add actuator");
allqueue(REDRAWBUTSLOGIC, 0);
break;
case B_CHANGE_ACT:
- base= FIRSTBASE;
- while(base) {
- act= base->object->actuators.first;
+ for(ob=G.main->object.first; ob; ob=ob->id.next) {
+ act= ob->actuators.first;
while(act) {
if(act->type != act->otype) {
init_actuator(act);
@@ -613,25 +593,22 @@
}
act= act->next;
}
- base= base->next;
}
allqueue(REDRAWBUTSLOGIC, 0);
break;
case B_DEL_ACT:
- base= FIRSTBASE;
- while(base) {
- act= base->object->actuators.first;
+ for(ob=G.main->object.first; ob; ob=ob->id.next) {
+ act= ob->actuators.first;
while(act) {
if(act->flag & ACT_DEL) {
- BLI_remlink(&(base->object->actuators), act);
+ BLI_remlink(&(ob->actuators), act);
unlink_actuator(act);
free_actuator(act);
break;
}
act= act->next;
}
- base= base->next;
}
BIF_undo_push("Delete actuator");
allqueue(REDRAWBUTSLOGIC, 0);
@@ -640,10 +617,8 @@
case B_SOUNDACT_BROWSE:
/* since we don't know which... */
didit= 0;
- base= FIRSTBASE;
- while(base)
- {
- act= base->object->actuators.first;
+ for(ob=G.main->object.first; ob; ob=ob->id.next) {
+ act= ob->actuators.first;
while(act)
{
if(act->type==ACT_SOUND)
@@ -684,7 +659,6 @@
}
if(didit)
break;
- base= base->next;
}
allqueue(REDRAWBUTSLOGIC, 0);
allqueue(REDRAWSOUND, 0);
@@ -1703,7 +1677,7 @@
}
uiDefButI(block, NUM, 0, "Blendin: ", xco+30, yco-64, (width-60)/2, 19, &aa->blendin, 0.0, MAXFRAMEF, 0.0, 0.0, "Number of frames of motion blending");
- uiDefButS(block, NUM, 0, "Priority: ", xco+30+(width-60)/2, yco-64, (width-60)/2, 19, &aa->priority, 0.0, 100.0, 0.0, 0.0, "Execution priority - lower numbers will override actions with higher numbers, With 2 or more actions at once, the overriding clannels must be lower in the stack");
+ uiDefButS(block, NUM, 0, "Priority: ", xco+30+(width-60)/2, yco-64, (width-60)/2, 19, &aa->priority, 0.0, 100.0, 0.0, 0.0, "Execution priority - lower numbers will override actions with higher numbers, With 2 or more actions at once, the overriding channels must be lower in the stack");
uiDefBut(block, TEX, 0, "FrameProp: ",xco+30, yco-84, width-60, 19, aa->frameProp, 0.0, 31.0, 0, 0, "Assign this property this actions current frame number");
Modified: branches/apricot/source/gameengine/Converter/BL_ActionActuator.cpp
===================================================================
--- branches/apricot/source/gameengine/Converter/BL_ActionActuator.cpp 2008-07-01 16:43:46 UTC (rev 15398)
+++ branches/apricot/source/gameengine/Converter/BL_ActionActuator.cpp 2008-07-01 17:01:14 UTC (rev 15399)
@@ -641,6 +641,9 @@
m_blendframe = 0;
}
}
+ else {
+ return NULL;
+ }
Py_INCREF(Py_None);
return Py_None;
@@ -660,6 +663,9 @@
{
m_startframe = start;
}
+ else {
+ return NULL;
+ }
Py_INCREF(Py_None);
return Py_None;
@@ -679,6 +685,9 @@
{
m_endframe = end;
}
+ else {
+ return NULL;
+ }
Py_INCREF(Py_None);
return Py_None;
@@ -699,6 +708,9 @@
{
m_blendin = blendin;
}
+ else {
+ return NULL;
+ }
Py_INCREF(Py_None);
return Py_None;
@@ -724,6 +736,9 @@
if (m_blendframe>m_blendin)
m_blendframe = m_blendin;
}
+ else {
+ return NULL;
+ }
Py_INCREF(Py_None);
return Py_None;
@@ -745,6 +760,9 @@
{
m_priority = priority;
}
+ else {
+ return NULL;
+ }
Py_INCREF(Py_None);
return Py_None;
@@ -768,6 +786,9 @@
else if (m_localtime>m_endframe)
m_localtime=m_endframe;
}
+ else {
+ return NULL;
+ }
Py_INCREF(Py_None);
return Py_None;
@@ -788,6 +809,9 @@
{
m_propname = string;
}
+ else {
+ return NULL;
+ }
Py_INCREF(Py_None);
return Py_None;
@@ -807,6 +831,9 @@
{
m_framepropname = string;
}
+ else {
+ return NULL;
+ }
Py_INCREF(Py_None);
return Py_None;
@@ -822,6 +849,9 @@
{
m_propname = string;
}
+ else {
+ return NULL;
+ }
Py_INCREF(Py_None);
return Py_None;
@@ -846,7 +876,8 @@
int row,col;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list