Revision: 28245
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28245
Author: campbellbarton
Date: 2010-04-17 17:47:00 +0200 (Sat, 17 Apr 2010)
Log Message:
-----------
bugfix and cleanup
- BGE Shader.setSampler(name, index): index range check was wrong.
- Compositor check for an invalid channel was incorrect.
- getting the center of selected verts used an uninitalized z axis.
- do_init_render_material() used && rather then & when testing for MA_TRANSP.
- weight paint activate flipped bone used && rather then & for flag checking.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/material.c
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenlib/intern/threads.c
trunk/blender/source/blender/blenlib/intern/uvproject.c
trunk/blender/source/blender/editors/armature/poseobject.c
trunk/blender/source/blender/editors/mesh/editmesh_loop.c
trunk/blender/source/blender/editors/mesh/editmesh_mods.c
trunk/blender/source/blender/editors/space_nla/nla_edit.c
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/nodes/intern/CMP_util.c
trunk/blender/source/gameengine/Converter/BL_ArmatureConstraint.cpp
trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp
trunk/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_SoundActuator.cpp
Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2010-04-17
09:41:27 UTC (rev 28244)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2010-04-17
15:47:00 UTC (rev 28245)
@@ -445,7 +445,7 @@
return (s->totdisp % (3*3) == 0)? 3: 4;
}
-static void layerSwap_mdisps(void *data, int *ci)
+static void layerSwap_mdisps(void *data, const int *ci)
{
MDisps *s = data;
float (*d)[3] = NULL;
Modified: trunk/blender/source/blender/blenkernel/intern/material.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/material.c 2010-04-17
09:41:27 UTC (rev 28244)
+++ trunk/blender/source/blender/blenkernel/intern/material.c 2010-04-17
15:47:00 UTC (rev 28245)
@@ -730,7 +730,7 @@
/* since the raytracer doesnt recalc O structs for each ray, we have to
preset them all */
if(r_mode & R_RAYTRACE) {
- if((ma->mode & (MA_RAYMIRROR|MA_SHADOW_TRA)) || ((ma->mode &&
MA_TRANSP) && (ma->mode & MA_RAYTRANSP))) {
+ if((ma->mode & (MA_RAYMIRROR|MA_SHADOW_TRA)) || ((ma->mode &
MA_TRANSP) && (ma->mode & MA_RAYTRANSP))) {
ma->texco |= NEED_UV|TEXCO_ORCO|TEXCO_REFL|TEXCO_NORM;
if(r_mode & R_OSA) ma->texco |= TEXCO_OSA;
}
Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c 2010-04-17
09:41:27 UTC (rev 28244)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c 2010-04-17
15:47:00 UTC (rev 28245)
@@ -396,7 +396,7 @@
if(dynamics) {
BKE_ptcache_free_list(&psys->ptcaches);
psys->clmd->point_cache = psys->pointcache = NULL;
- psys->clmd->ptcaches.first = psys->clmd->ptcaches.first
= NULL;
+ psys->clmd->ptcaches.first = psys->clmd->ptcaches.last
= NULL;
modifier_free((ModifierData*)psys->clmd);
Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c
2010-04-17 09:41:27 UTC (rev 28244)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c
2010-04-17 15:47:00 UTC (rev 28245)
@@ -2385,7 +2385,7 @@
static void apply_particle_fluidsim(ParticleSystem *psys, ParticleData *pa,
ParticleSettings *part, ParticleSimulationData *sim, float dfra, float cfra){
ParticleTarget *pt;
- float dtime = dfra*psys_get_timestep(sim);
+// float dtime = dfra*psys_get_timestep(sim);
float particle_mass = part->mass;
particle_fluidsim(psys, pa, part, sim, dfra, cfra, particle_mass);
@@ -3688,7 +3688,7 @@
PARTICLE_P;
int oldtotpart;
float disp, *vg_vel= 0, *vg_tan= 0, *vg_rot= 0, *vg_size= 0;
- int init= 0, emit= 0, only_children_changed= 0;
+ int init= 0, emit= 0; //, only_children_changed= 0;
int framenr, framedelta, startframe = 0, endframe = 100;
framenr= (int)sim->scene->r.cfra;
Modified: trunk/blender/source/blender/blenlib/intern/threads.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/threads.c 2010-04-17
09:41:27 UTC (rev 28244)
+++ trunk/blender/source/blender/blenlib/intern/threads.c 2010-04-17
15:47:00 UTC (rev 28245)
@@ -29,6 +29,7 @@
*/
#include <errno.h>
+#include <string.h>
#include "MEM_guardedalloc.h"
Modified: trunk/blender/source/blender/blenlib/intern/uvproject.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/uvproject.c 2010-04-17
09:41:27 UTC (rev 28244)
+++ trunk/blender/source/blender/blenlib/intern/uvproject.c 2010-04-17
15:47:00 UTC (rev 28245)
@@ -136,7 +136,7 @@
uci.do_persp = (camera->type==CAM_PERSP);
uci.camangle= lens_to_angle(camera->lens) / 2.0f;
- uci.camsize= uci.do_persp ? uci.camsize= tanf(uci.camangle) :
camera->ortho_scale;
+ uci.camsize= uci.do_persp ? tanf(uci.camangle) : camera->ortho_scale;
if (invert_m4_m4(uci.caminv, ob->obmat)) {
UvCameraInfo *uci_pt;
Modified: trunk/blender/source/blender/editors/armature/poseobject.c
===================================================================
--- trunk/blender/source/blender/editors/armature/poseobject.c 2010-04-17
09:41:27 UTC (rev 28244)
+++ trunk/blender/source/blender/editors/armature/poseobject.c 2010-04-17
15:47:00 UTC (rev 28245)
@@ -1459,7 +1459,7 @@
if(ob==NULL) return;
- if(ob->mode && OB_MODE_WEIGHT_PAINT) {
+ if(ob->mode & OB_MODE_WEIGHT_PAINT) {
ob= modifiers_isDeformedByArmature(ob);
}
if(ob && (ob->mode & OB_MODE_POSE)) {
Modified: trunk/blender/source/blender/editors/mesh/editmesh_loop.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_loop.c 2010-04-17
09:41:27 UTC (rev 28244)
+++ trunk/blender/source/blender/editors/mesh/editmesh_loop.c 2010-04-17
15:47:00 UTC (rev 28245)
@@ -629,7 +629,7 @@
int len=0;
short numcuts= RNA_int_get(op->ptr, "num_cuts");
short mode= RNA_int_get(op->ptr, "type");
- int corner_cut_pattern= RNA_enum_get(op->ptr,"corner_cut_pattern");
+// int corner_cut_pattern= RNA_enum_get(op->ptr,"corner_cut_pattern");
/* edit-object needed for matrix, and ar->regiondata for projections to
work */
if (ELEM3(NULL, obedit, ar, ar->regiondata))
Modified: trunk/blender/source/blender/editors/mesh/editmesh_mods.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_mods.c 2010-04-17
09:41:27 UTC (rev 28244)
+++ trunk/blender/source/blender/editors/mesh/editmesh_mods.c 2010-04-17
15:47:00 UTC (rev 28245)
@@ -4058,7 +4058,7 @@
EditVert *eve;
int nsel= 0;
- cent_r[0]= cent_r[1]= cent_r[0]= 0.0;
+ zero_v3(cent_r);
for (eve= em->verts.first; eve; eve= eve->next) {
if (eve->f & SELECT) {
Modified: trunk/blender/source/blender/editors/space_nla/nla_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_nla/nla_edit.c 2010-04-17
09:41:27 UTC (rev 28244)
+++ trunk/blender/source/blender/editors/space_nla/nla_edit.c 2010-04-17
15:47:00 UTC (rev 28245)
@@ -903,7 +903,7 @@
ListBase anim_data = {NULL, NULL};
bAnimListElem *ale;
int filter;
- int flag = 0;
+// int flag = 0;
/* get editor data */
if (ANIM_animdata_get_context(C, &ac) == 0)
Modified: trunk/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/makesrna.c 2010-04-17
09:41:27 UTC (rev 28244)
+++ trunk/blender/source/blender/makesrna/intern/makesrna.c 2010-04-17
15:47:00 UTC (rev 28245)
@@ -1636,7 +1636,7 @@
}
}
-static const char *rna_property_subtypename(PropertyType type)
+static const char *rna_property_subtypename(PropertySubType type)
{
switch(type) {
case PROP_NONE: return "PROP_NONE";
Modified: trunk/blender/source/blender/nodes/intern/CMP_util.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_util.c 2010-04-17
09:41:27 UTC (rev 28244)
+++ trunk/blender/source/blender/nodes/intern/CMP_util.c 2010-04-17
15:47:00 UTC (rev 28245)
@@ -578,9 +578,9 @@
valbuf->yof= cbuf->yof;
valf= valbuf->rect;
-
+
/* defaults to returning alpha channel */
- if ((channel < CHAN_R) && (channel > CHAN_A)) channel = CHAN_A;
+ if ((channel < CHAN_R) || (channel > CHAN_A)) channel = CHAN_A;
rectf= cbuf->rect + channel;
Modified: trunk/blender/source/gameengine/Converter/BL_ArmatureConstraint.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_ArmatureConstraint.cpp
2010-04-17 09:41:27 UTC (rev 28244)
+++ trunk/blender/source/gameengine/Converter/BL_ArmatureConstraint.cpp
2010-04-17 15:47:00 UTC (rev 28245)
@@ -74,7 +74,7 @@
bConstraint *constraint,
KX_GameObject* target,
KX_GameObject* subtarget)
- : PyObjectPlus(), m_armature(armature), m_constraint(constraint),
m_posechannel(posechannel)
+ : PyObjectPlus(), m_constraint(constraint), m_posechannel(posechannel),
m_armature(armature)
{
m_target = target;
m_blendtarget = (target) ? target->GetBlenderObject() : NULL;
Modified: trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp 2010-04-17
09:41:27 UTC (rev 28244)
+++ trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp 2010-04-17
15:47:00 UTC (rev 28245)
@@ -884,7 +884,7 @@
{
int loc = GetUniformLocation(uniform);
if(loc != -1) {
- if(index >= MAXTEX && index < 0)
+ if(index >= MAXTEX || index < 0)
spit("Invalid texture sample index: " << index);
#ifdef SORT_UNIFORMS
Modified: trunk/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp
2010-04-17 09:41:27 UTC (rev 28244)
+++ trunk/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp
2010-04-17 15:47:00 UTC (rev 28245)
@@ -380,7 +380,7 @@
};
PyMethodDef KX_CameraActuator::Methods[] = {
- {NULL,NULL,NULL,NULL} //Sentinel
+ {NULL, NULL} //Sentinel
};
PyAttributeDef KX_CameraActuator::Attributes[] = {
Modified: trunk/blender/source/gameengine/Ketsji/KX_SoundActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_SoundActuator.cpp 2010-04-17
09:41:27 UTC (rev 28244)
+++ trunk/blender/source/gameengine/Ketsji/KX_SoundActuator.cpp 2010-04-17
15:47:00 UTC (rev 28245)
@@ -299,7 +299,7 @@
KX_PYMETHODTABLE_NOARGS(KX_SoundActuator, startSound),
KX_PYMETHODTABLE_NOARGS(KX_SoundActuator, pauseSound),
KX_PYMETHODTABLE_NOARGS(KX_SoundActuator, stopSound),
- {NULL,NULL,NULL,NULL} //Sentinel
+ {NULL, NULL} //Sentinel
};
PyAttributeDef KX_SoundActuator::Attributes[] = {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
