Change in Branch file not propagating to Build


#1

Trying to follow directions for making a patch from this page https://developer.blender.org/T60824
(thanks Robert)

Got to the point where I created a branch:
1

Make the change to a file (rna_curve.c in this case) > save.
Then build.
Original changed file (rna_curve.c):
prop = RNA_def_property(srna, “offset_x”, PROP_FLOAT, PROP_DISTANCE);
RNA_def_property_float_sdna(prop, NULL, “xof”);
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
RNA_def_property_ui_range(prop, -50.0f, 50.0f, 10, 3);
RNA_def_property_ui_text(prop, “X Offset”, “Horizontal offset from the object origin”);
RNA_def_property_update(prop, 0, “rna_Curve_update_data”);

But when I run the build
there is no change:

2

What did I do wrong?
tks


#2

Are there any error messages while building? Are you executing the newly build executable?


#3

No errors, only warnings about OSSpinlock being depreciated.
‘About’ shows today’s date as build date, so no doubt I am on the right one.

3


#4

hmm, not what is wrong. Please show the output of git diff master in the blender directory (while being in your new branch).

Also maybe try removing the build directory and build everything again.


#5

Yes, deleted and rebuilt at least 3 times.
I don’t think it’s relevant, but cannot build on Xcode, get this error:
errorio

Here is diff output ;

joel-godinsmac:blender joelgodin$ git branch
  master
* rna_curve_munits
joel-godinsmac:blender joelgodin$ git diff master
diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c
index b92d156b674..e48930e19ca 100644
--- a/source/blender/makesrna/intern/rna_curve.c
+++ b/source/blender/makesrna/intern/rna_curve.c
@@ -1041,14 +1041,14 @@ static void rna_def_font(BlenderRNA *UNUSED(brna), StructRNA *srna)
        RNA_def_property_ui_text(prop, "Shear", "Italic angle of the characters");
        RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 
-       prop = RNA_def_property(srna, "offset_x", PROP_FLOAT, PROP_NONE);
+       prop = RNA_def_property(srna, "offset_x", PROP_FLOAT, PROP_DISTANCE);
        RNA_def_property_float_sdna(prop, NULL, "xof");
        RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
        RNA_def_property_ui_range(prop, -50.0f, 50.0f, 10, 3);
        RNA_def_property_ui_text(prop, "X Offset", "Horizontal offset from the object origin");
        RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 
-       prop = RNA_def_property(srna, "offset_y", PROP_FLOAT, PROP_NONE);
+       prop = RNA_def_property(srna, "offset_y", PROP_FLOAT, PROP_DISTANCE);
        RNA_def_property_float_sdna(prop, NULL, "yof");
        RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
        RNA_def_property_ui_range(prop, -50.0f, 50.0f, 10, 3);
joel-godinsmac:blender joelgodin$

#6

I forgot it took previous blender settings,
loaded factory default, evidently it was there, just the wrong color.

4

Will upload diff soon.

Sorry about that.