[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40315] branches/soc-2011-radish: Changed the branch code markers to say "Radish" in response to a review.
Jason Hays
jason_hays22 at mymail.eku.edu
Sun Sep 18 05:49:03 CEST 2011
Revision: 40315
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40315
Author: jason_hays22
Date: 2011-09-18 03:49:00 +0000 (Sun, 18 Sep 2011)
Log Message:
-----------
Changed the branch code markers to say "Radish" in response to a review.
They weren't & aren't meant to show ownership, they just help me navigate my related code.
Modified Paths:
--------------
branches/soc-2011-radish/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-radish/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-radish/source/blender/blenkernel/BKE_paint.h
branches/soc-2011-radish/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-radish/source/blender/blenkernel/intern/armature.c
branches/soc-2011-radish/source/blender/blenkernel/intern/paint.c
branches/soc-2011-radish/source/blender/editors/armature/editarmature.c
branches/soc-2011-radish/source/blender/editors/armature/meshlaplacian.c
branches/soc-2011-radish/source/blender/editors/include/ED_mesh.h
branches/soc-2011-radish/source/blender/editors/include/ED_view3d.h
branches/soc-2011-radish/source/blender/editors/interface/interface_templates.c
branches/soc-2011-radish/source/blender/editors/mesh/editmesh.c
branches/soc-2011-radish/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2011-radish/source/blender/editors/object/object_intern.h
branches/soc-2011-radish/source/blender/editors/object/object_ops.c
branches/soc-2011-radish/source/blender/editors/object/object_vgroup.c
branches/soc-2011-radish/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-radish/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2011-radish/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2011-radish/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2011-radish/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-radish/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-radish/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2011-radish/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2011-radish/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-radish/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2011-radish/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-radish/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-radish/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_scene.c
Modified: branches/soc-2011-radish/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2011-radish/release/scripts/startup/bl_ui/space_view3d.py 2011-09-18 03:29:17 UTC (rev 40314)
+++ branches/soc-2011-radish/release/scripts/startup/bl_ui/space_view3d.py 2011-09-18 03:49:00 UTC (rev 40315)
@@ -1072,7 +1072,7 @@
layout.operator("object.vertex_group_invert", text="Invert")
layout.operator("object.vertex_group_clean", text="Clean")
layout.operator("object.vertex_group_levels", text="Levels")
- #Jason
+ # Radish
layout.operator("object.vertex_group_fix", text="Fix Deforms")
layout.separator()
Modified: branches/soc-2011-radish/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2011-radish/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2011-09-18 03:29:17 UTC (rev 40314)
+++ branches/soc-2011-radish/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2011-09-18 03:49:00 UTC (rev 40315)
@@ -646,7 +646,7 @@
elif context.weight_paint_object and brush:
layout.prop(context.tool_settings, "vertex_group_weight", text="Weight", slider=True)
layout.prop(context.tool_settings, "use_auto_normalize", text="Auto Normalize")
- # Jason was here
+ # Radish
layout.prop(context.tool_settings, "use_multipaint", text="Multi-Paint")
col = layout.column()
Modified: branches/soc-2011-radish/source/blender/blenkernel/BKE_paint.h
===================================================================
--- branches/soc-2011-radish/source/blender/blenkernel/BKE_paint.h 2011-09-18 03:29:17 UTC (rev 40314)
+++ branches/soc-2011-radish/source/blender/blenkernel/BKE_paint.h 2011-09-18 03:49:00 UTC (rev 40315)
@@ -59,7 +59,7 @@
* Texture paint could be removed since selected faces are not used
* however hiding faces is useful */
int paint_facesel_test(struct Object *ob);
-/* Jason */
+/* Radish */
int paint_vertsel_test(struct Object *ob);
/* Session data (mode-specific) */
Modified: branches/soc-2011-radish/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/soc-2011-radish/source/blender/blenkernel/intern/DerivedMesh.c 2011-09-18 03:29:17 UTC (rev 40314)
+++ branches/soc-2011-radish/source/blender/blenkernel/intern/DerivedMesh.c 2011-09-18 03:49:00 UTC (rev 40315)
@@ -40,7 +40,7 @@
#include "DNA_cloth_types.h"
#include "DNA_key_types.h"
#include "DNA_meshdata_types.h"
-// Jason
+/* Radish */
#include "DNA_armature_types.h"
#include "DNA_object_types.h"
@@ -1689,12 +1689,12 @@
float colf[4], input = 0.0f;
int i;
- // Jason was here
+ /* Radish */
int make_black= FALSE;
if (me->dvert) {
if ((selected > 1) && (draw_flag & CALC_WP_MULTIPAINT)) {
- // Jason was here
+ /* Radish */
int was_a_nonzero= FALSE;
for (i=0; i<me->dvert[vert].totweight; i++) {
/* in multipaint, get the average if auto normalize is inactive
@@ -1761,7 +1761,7 @@
unsigned char *wtcol;
int i;
- // Jason was here
+ /* Radish */
int defbase_len = BLI_countlist(&ob->defbase);
char *defbase_sel = MEM_mallocN(defbase_len * sizeof(char), __func__);
int selected = get_selected_defgroups(ob, defbase_sel, defbase_len);
@@ -1777,7 +1777,7 @@
if (mf->v4)
calc_weightpaint_vert_color(ob, coba, mf->v4, &wtcol[(i*4 + 3)*4], defbase_sel, selected, unselected, draw_flag);
}
- // Jason
+ /* Radish */
MEM_freeN(defbase_sel);
CustomData_add_layer(&dm->faceData, CD_WEIGHT_MCOL, CD_ASSIGN, wtcol, dm->numFaceData);
@@ -1807,7 +1807,7 @@
int has_multires = mmd != NULL, multires_applied = 0;
int sculpt_mode = ob->mode & OB_MODE_SCULPT && ob->sculpt;
- // Jason
+ /* Radish */
int draw_flag= ((scene->toolsettings->multipaint ? CALC_WP_MULTIPAINT : 0) |
(scene->toolsettings->auto_normalize ? CALC_WP_AUTO_NORMALIZE : 0));
@@ -1990,7 +1990,7 @@
}
if((dataMask & CD_MASK_WEIGHT_MCOL) && (ob->mode & OB_MODE_WEIGHT_PAINT))
- add_weight_mcol_dm(ob, dm, draw_flag); // Jason
+ add_weight_mcol_dm(ob, dm, draw_flag); /* Radish */
/* Constructive modifiers need to have an origindex
* otherwise they wont have anywhere to copy the data from.
@@ -2102,7 +2102,7 @@
CDDM_calc_normals(finaldm);
if((dataMask & CD_MASK_WEIGHT_MCOL) && (ob->mode & OB_MODE_WEIGHT_PAINT))
- add_weight_mcol_dm(ob, finaldm, draw_flag);// Jason
+ add_weight_mcol_dm(ob, finaldm, draw_flag);/* Radish */
} else if(dm) {
finaldm = dm;
} else {
@@ -2114,7 +2114,7 @@
}
if((dataMask & CD_MASK_WEIGHT_MCOL) && (ob->mode & OB_MODE_WEIGHT_PAINT))
- add_weight_mcol_dm(ob, finaldm, draw_flag);// Jason
+ add_weight_mcol_dm(ob, finaldm, draw_flag);/* Radish */
}
/* add an orco layer if needed */
@@ -2387,7 +2387,7 @@
static void mesh_build_data(Scene *scene, Object *ob, CustomDataMask dataMask)
{
Object *obact = scene->basact?scene->basact->object:NULL;
- int editing = paint_facesel_test(ob) || paint_vertsel_test(ob);// Jason: paint_vertsel_test
+ int editing = paint_facesel_test(ob) || paint_vertsel_test(ob);/* Radish: paint_vertsel_test */
/* weight paint and face select need original indices because of selection buffer drawing */
int needMapping = (ob==obact) && (editing || (ob->mode & (OB_MODE_WEIGHT_PAINT|OB_MODE_VERTEX_PAINT)));
Modified: branches/soc-2011-radish/source/blender/blenkernel/intern/armature.c
===================================================================
--- branches/soc-2011-radish/source/blender/blenkernel/intern/armature.c 2011-09-18 03:29:17 UTC (rev 40314)
+++ branches/soc-2011-radish/source/blender/blenkernel/intern/armature.c 2011-09-18 03:49:00 UTC (rev 40315)
@@ -2465,7 +2465,7 @@
}
}
-/* Jason was here */
+/* Radish */
/* Returns total selected vgroups */
int get_selected_defgroups(Object *ob, char *dg_selection, int defbase_len)
{
Modified: branches/soc-2011-radish/source/blender/blenkernel/intern/paint.c
===================================================================
--- branches/soc-2011-radish/source/blender/blenkernel/intern/paint.c 2011-09-18 03:29:17 UTC (rev 40314)
+++ branches/soc-2011-radish/source/blender/blenkernel/intern/paint.c 2011-09-18 03:49:00 UTC (rev 40315)
@@ -96,7 +96,7 @@
{
return (ob && ob->type==OB_MESH && ob->data && (((Mesh *)ob->data)->editflag & ME_EDIT_PAINT_MASK) && (ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT)));
}
-/* Jason */
+/* Radish */
int paint_vertsel_test(Object *ob)
{
return (ob && ob->type==OB_MESH && ob->data && (((Mesh *)ob->data)->editflag & ME_EDIT_VERT_SEL) && (ob->mode & OB_MODE_WEIGHT_PAINT));
Modified: branches/soc-2011-radish/source/blender/editors/armature/editarmature.c
===================================================================
--- branches/soc-2011-radish/source/blender/editors/armature/editarmature.c 2011-09-18 03:29:17 UTC (rev 40314)
+++ branches/soc-2011-radish/source/blender/editors/armature/editarmature.c 2011-09-18 03:49:00 UTC (rev 40315)
@@ -4276,7 +4276,7 @@
return count;
}
-// Jason
+/* Radish */
Bone* get_other_selected_bone(Object *ob) {
Bone *bone;
int i;
@@ -4307,10 +4307,10 @@
bArmature *arm= ob->data;
/* since we do unified select, we don't shift+select a bone if the armature object was not active yet */
- /* Jason was here, I'm doing a select for multibone painting */
+ /* Radish, I'm doing a select for multibone painting */
if (scene->toolsettings->multipaint && (base != scene->basact)) {//if (!(extend) || (base != scene->basact)) {
Bone *new_act_bone;
- /* Jason was here */
+ /* Radish */
/* only deselect all if they aren't using 'shift' */
if(!extend) {
ED_pose_deselectall(ob, 0);
@@ -4319,7 +4319,7 @@
ED_vgroup_select_by_name(OBACT, nearBone->name);
}
else {
- // Jason deselect this bone specifically if it is selected already
+ /* Radish deselect this bone specifically if it is selected already */
if (nearBone->flag & BONE_SELECTED) {
nearBone->flag &= ~(BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL);
if(nearBone == arm->act_bone) {
@@ -5105,7 +5105,7 @@
static int pose_de_select_all_exec(bContext *C, wmOperator *op)
{
int action = RNA_enum_get(op->ptr, "action");
- //Jason
+ //Radish
Object *ob = NULL;
Scene *scene= CTX_data_scene(C);
int multipaint = scene->toolsettings->multipaint;
@@ -5138,7 +5138,7 @@
CTX_DATA_END;
WM_event_add_notifier(C, NC_OBJECT|ND_BONE_SELECT, NULL);
- // Jason
+ /* Radish */
if(multipaint) {
ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
Modified: branches/soc-2011-radish/source/blender/editors/armature/meshlaplacian.c
===================================================================
--- branches/soc-2011-radish/source/blender/editors/armature/meshlaplacian.c 2011-09-18 03:29:17 UTC (rev 40314)
+++ branches/soc-2011-radish/source/blender/editors/armature/meshlaplacian.c 2011-09-18 03:49:00 UTC (rev 40315)
@@ -657,7 +657,7 @@
int *vertsflipped = NULL, *mask= NULL;
int a, totface, j, bbone, firstsegment, lastsegment;
- // Jason
+ /* Radish */
MVert *mv = me->mvert;
int use_vert_sel= FALSE;
@@ -670,7 +670,7 @@
for(totface=0, a=0, mface=me->mface; a<me->totface; a++, mface++) {
totface++;
if(mface->v4) totface++;
- // Jason (added selectedVerts content for vertex mask, they used to just equal 1)
+ /* Radish (added selectedVerts content for vertex mask, they used to just equal 1) */
if(mask && ((mface->flag & ME_FACE_SEL) || use_vert_sel)) {
mask[mface->v1]= use_vert_sel ? ((mv+mface->v1)->flag & 1): 1;
mask[mface->v2]= use_vert_sel ? ((mv+mface->v2)->flag & 1): 1;
Modified: branches/soc-2011-radish/source/blender/editors/include/ED_mesh.h
===================================================================
--- branches/soc-2011-radish/source/blender/editors/include/ED_mesh.h 2011-09-18 03:29:17 UTC (rev 40314)
+++ branches/soc-2011-radish/source/blender/editors/include/ED_mesh.h 2011-09-18 03:49:00 UTC (rev 40315)
@@ -122,7 +122,7 @@
int EM_vertColorCheck(struct EditMesh *em);
void undo_push_mesh(struct bContext *C, const char *name);
-/* Jason */
+/* Radish */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list