Revision: 37969
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37969
Author: campbellbarton
Date: 2011-06-30 01:40:20 +0000 (Thu, 30 Jun 2011)
Log Message:
-----------
minor edits, no functional change.
Modified Paths:
--------------
trunk/blender/source/blender/modifiers/intern/MOD_displace.c
trunk/blender/source/blender/render/extern/include/RE_pipeline.h
trunk/blender/source/blender/render/intern/source/convertblender.c
Modified: trunk/blender/source/blender/modifiers/intern/MOD_displace.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_displace.c
2011-06-30 01:30:35 UTC (rev 37968)
+++ trunk/blender/source/blender/modifiers/intern/MOD_displace.c
2011-06-30 01:40:20 UTC (rev 37969)
@@ -172,6 +172,7 @@
MDeformVert *dvert = NULL;
int defgrp_index;
float (*tex_co)[3];
+ float weight= 1.0f; /* init value unused but some compilers may
complain */
if(!dmd->texture) return;
if(dmd->strength == 0.0f) return;
@@ -189,17 +190,10 @@
for(i = 0; i < numVerts; ++i) {
TexResult texres;
float delta = 0, strength = dmd->strength;
- MDeformWeight *def_weight = NULL;
if(dvert) {
- int j;
- for(j = 0; j < dvert[i].totweight; ++j) {
- if(dvert[i].dw[j].def_nr == defgrp_index) {
- def_weight = &dvert[i].dw[j];
- break;
- }
- }
- if(!def_weight || def_weight->weight==0.0f) continue;
+ weight= defvert_find_weight(dvert + i, defgrp_index);
+ if(weight == 0.0f) continue;
}
texres.nor = NULL;
@@ -207,7 +201,7 @@
delta = texres.tin - dmd->midlevel;
- if(def_weight) strength *= def_weight->weight;
+ if(dvert) strength *= weight;
delta *= strength;
CLAMP(delta, -10000, 10000);
Modified: trunk/blender/source/blender/render/extern/include/RE_pipeline.h
===================================================================
--- trunk/blender/source/blender/render/extern/include/RE_pipeline.h
2011-06-30 01:30:35 UTC (rev 37968)
+++ trunk/blender/source/blender/render/extern/include/RE_pipeline.h
2011-06-30 01:40:20 UTC (rev 37969)
@@ -266,7 +266,7 @@
#define RE_BAKE_ALPHA 11
#define RE_BAKE_EMIT 12
-void RE_Database_Baking(struct Render *re, struct Main *bmain, struct Scene
*scene, unsigned int lay, int type, struct Object *actob);
+void RE_Database_Baking(struct Render *re, struct Main *bmain, struct Scene
*scene, unsigned int lay, const int type, struct Object *actob);
void RE_DataBase_GetView(struct Render *re, float mat[][4]);
void RE_GetCameraWindow(struct Render *re, struct Object *camera, int frame,
float mat[][4]);
Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c
2011-06-30 01:30:35 UTC (rev 37968)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c
2011-06-30 01:40:20 UTC (rev 37969)
@@ -5680,13 +5680,14 @@
RE_BAKE_DISPLACEMENT:for baking, no lamps, only selected objects
RE_BAKE_SHADOW: for baking, only shadows, but all objects
*/
-void RE_Database_Baking(Render *re, Main *bmain, Scene *scene, unsigned int
lay, int type, Object *actob)
+void RE_Database_Baking(Render *re, Main *bmain, Scene *scene, unsigned int
lay, const int type, Object *actob)
{
Object *camera;
float mat[4][4];
float amb[3];
- int onlyselected, nolamps;
-
+ const short onlyselected= !ELEM3(type, RE_BAKE_LIGHT, RE_BAKE_ALL,
RE_BAKE_SHADOW);
+ const short nolamps= ELEM3(type, RE_BAKE_NORMALS, RE_BAKE_TEXTURE,
RE_BAKE_DISPLACEMENT);
+
re->main= bmain;
re->scene= scene;
re->lay= lay;
@@ -5755,9 +5756,6 @@
set_node_shader_lamp_loop(shade_material_loop);
/* MAKE RENDER DATA */
- nolamps= !ELEM3(type, RE_BAKE_LIGHT, RE_BAKE_ALL, RE_BAKE_SHADOW);
- onlyselected= ELEM3(type, RE_BAKE_NORMALS, RE_BAKE_TEXTURE,
RE_BAKE_DISPLACEMENT);
-
database_init_objects(re, lay, nolamps, onlyselected, actob, 0);
set_material_lightgroups(re);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
